@shopify/cli-hydrogen 11.1.1 → 11.1.3

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

@@ -1,8 +1,8 @@
 import type {CartApiQueryFragment} from 'storefrontapi.generated';
 import type {CartLayout} from '~/components/CartMain';
 import {CartForm, Money, type OptimisticCart} from '@shopify/hydrogen';
-import {useEffect, useRef} from 'react';
-import {FetcherWithComponents, useFetcher} from 'react-router';
+import {useRef} from 'react';
+import { FetcherWithComponents } from 'react-router';
 
 type CartSummaryProps = {
   cart: OptimisticCart<CartApiQueryFragment | null>;
@@ -55,48 +55,28 @@ function CartDiscounts({
       ?.filter((discount) => discount.applicable)
       ?.map(({code}) => code) || [];
 
-  const discountRemoveFetcher = useFetcher({key: 'discount-remove'});
-  const discountAddFetcher = useFetcher({key: 'discount-add'});
-  const discountCodeInput = useRef<HTMLInputElement>(null);
-
-  // Clear the discount code input after the discount is added
-  useEffect(() => {
-    if (discountAddFetcher.data) {
-      discountCodeInput.current!.value = '';
-    }
-  }, [discountAddFetcher.data]);
-
   return (
     <div>
       {/* Have existing discount, display it with a remove option */}
       <dl hidden={!codes.length}>
         <div>
           <dt>Discount(s)</dt>
-          <UpdateDiscountForm fetcherKey="discount-remove">
+          <UpdateDiscountForm>
             <div className="cart-discount">
               <code>{codes?.join(', ')}</code>
               &nbsp;
-              <button disabled={discountRemoveFetcher.state !== 'idle'}>
-                Remove
-              </button>
+              <button>Remove</button>
             </div>
           </UpdateDiscountForm>
         </div>
       </dl>
 
       {/* Show an input to apply a discount */}
-      <UpdateDiscountForm discountCodes={codes} fetcherKey="discount-add">
+      <UpdateDiscountForm discountCodes={codes}>
         <div>
-          <input
-            type="text"
-            name="discountCode"
-            placeholder="Discount code"
-            ref={discountCodeInput}
-          />
+          <input type="text" name="discountCode" placeholder="Discount code" />
           &nbsp;
-          <button type="submit" disabled={discountAddFetcher.state !== 'idle'}>
-            Apply
-          </button>
+          <button type="submit">Apply</button>
         </div>
       </UpdateDiscountForm>
     </div>
@@ -106,15 +86,12 @@ function CartDiscounts({
 function UpdateDiscountForm({
   discountCodes,
   children,
-  fetcherKey,
 }: {
   discountCodes?: string[];
   children: React.ReactNode;
-  fetcherKey?: string;
 }) {
   return (
     <CartForm
-      fetcherKey={fetcherKey}
       route="/cart"
       action={CartForm.ACTIONS.DiscountCodesUpdate}
       inputs={{

package/dist/assets/hydrogen/starter/app/graphql/customer-account/CustomerAddressMutations.ts

@@ -4,8 +4,7 @@ export const UPDATE_ADDRESS_MUTATION = `#graphql
     $address: CustomerAddressInput!
     $addressId: ID!
     $defaultAddress: Boolean
-    $language: LanguageCode
- ) @inContext(language: $language) {
+ ) {
     customerAddressUpdate(
       address: $address
       addressId: $addressId
@@ -26,9 +25,8 @@ export const UPDATE_ADDRESS_MUTATION = `#graphql
 // NOTE: https://shopify.dev/docs/api/customer/latest/mutations/customerAddressDelete
 export const DELETE_ADDRESS_MUTATION = `#graphql
   mutation customerAddressDelete(
-    $addressId: ID!
-    $language: LanguageCode
-  ) @inContext(language: $language) {
+    $addressId: ID!,
+  ) {
     customerAddressDelete(addressId: $addressId) {
       deletedAddressId
       userErrors {
@@ -45,8 +43,7 @@ export const CREATE_ADDRESS_MUTATION = `#graphql
   mutation customerAddressCreate(
     $address: CustomerAddressInput!
     $defaultAddress: Boolean
-    $language: LanguageCode
-  ) @inContext(language: $language) {
+  ) {
     customerAddressCreate(
       address: $address
       defaultAddress: $defaultAddress

package/dist/assets/hydrogen/starter/app/graphql/customer-account/CustomerDetailsQuery.ts

@@ -31,7 +31,7 @@ export const CUSTOMER_FRAGMENT = `#graphql
 
 // NOTE: https://shopify.dev/docs/api/customer/latest/queries/customer
 export const CUSTOMER_DETAILS_QUERY = `#graphql
-  query CustomerDetails($language: LanguageCode) @inContext(language: $language) {
+  query CustomerDetails {
     customer {
       ...Customer
     }

package/dist/assets/hydrogen/starter/app/graphql/customer-account/CustomerOrderQuery.ts

@@ -46,7 +46,6 @@ export const CUSTOMER_ORDER_QUERY = `#graphql
     id
     name
     statusPageUrl
-    fulfillmentStatus
     processedAt
     fulfillments(first: 1) {
       nodes {
@@ -78,8 +77,7 @@ export const CUSTOMER_ORDER_QUERY = `#graphql
       }
     }
   }
-  query Order($orderId: ID!, $language: LanguageCode)
-    @inContext(language: $language) {
+  query Order($orderId: ID!) {
     order(id: $orderId) {
       ... on Order {
         ...Order

package/dist/assets/hydrogen/starter/app/graphql/customer-account/CustomerOrdersQuery.ts

@@ -1,4 +1,4 @@
-// NOTE: https://shopify.dev/docs/api/customer/latest/objects/Order
+// https://shopify.dev/docs/api/customer/latest/objects/Order
 export const ORDER_ITEM_FRAGMENT = `#graphql
   fragment OrderItem on Order {
     totalPrice {
@@ -6,7 +6,6 @@ export const ORDER_ITEM_FRAGMENT = `#graphql
       currencyCode
     }
     financialStatus
-    fulfillmentStatus
     fulfillments(first: 1) {
       nodes {
         status
@@ -18,7 +17,7 @@ export const ORDER_ITEM_FRAGMENT = `#graphql
   }
 ` as const;
 
-// NOTE: https://shopify.dev/docs/api/customer/latest/objects/Customer
+// https://shopify.dev/docs/api/customer/latest/objects/Customer
 export const CUSTOMER_ORDERS_FRAGMENT = `#graphql
   fragment CustomerOrders on Customer {
     orders(
@@ -43,7 +42,7 @@ export const CUSTOMER_ORDERS_FRAGMENT = `#graphql
   ${ORDER_ITEM_FRAGMENT}
 ` as const;
 
-// NOTE: https://shopify.dev/docs/api/customer/latest/queries/customer
+// https://shopify.dev/docs/api/customer/latest/queries/customer
 export const CUSTOMER_ORDERS_QUERY = `#graphql
   ${CUSTOMER_ORDERS_FRAGMENT}
   query CustomerOrders(
@@ -51,8 +50,7 @@ export const CUSTOMER_ORDERS_QUERY = `#graphql
     $first: Int
     $last: Int
     $startCursor: String
-    $language: LanguageCode
-  ) @inContext(language: $language) {
+  ) {
     customer {
       ...CustomerOrders
     }

package/dist/assets/hydrogen/starter/app/graphql/customer-account/CustomerUpdateMutation.ts

@@ -1,9 +1,8 @@
-// NOTE: https://shopify.dev/docs/api/customer/latest/mutations/customerUpdate
 export const CUSTOMER_UPDATE_MUTATION = `#graphql
+  # https://shopify.dev/docs/api/customer/latest/mutations/customerUpdate
   mutation customerUpdate(
     $customer: CustomerUpdateInput!
-    $language: LanguageCode
-  ) @inContext(language: $language) {
+  ){
     customerUpdate(input: $customer) {
       customer {
         firstName

package/dist/assets/hydrogen/starter/app/routes/account.addresses.tsx

@@ -42,8 +42,7 @@ export async function loader({context}: LoaderFunctionArgs) {
 }
 
 export async function action({request, context}: ActionFunctionArgs) {
-  const {customerAccount, storefront} = context;
-  const {i18n} = storefront;
+  const {customerAccount} = context;
 
   try {
     const form = await request.formData();
@@ -97,11 +96,7 @@ export async function action({request, context}: ActionFunctionArgs) {
           const {data, errors} = await customerAccount.mutate(
             CREATE_ADDRESS_MUTATION,
             {
-              variables: {
-                address,
-                defaultAddress,
-                language: i18n.language,
-              },
+              variables: {address, defaultAddress},
             },
           );
 
@@ -150,7 +145,6 @@ export async function action({request, context}: ActionFunctionArgs) {
                 address,
                 addressId: decodeURIComponent(addressId),
                 defaultAddress,
-                language: i18n.language,
               },
             },
           );
@@ -196,10 +190,7 @@ export async function action({request, context}: ActionFunctionArgs) {
           const {data, errors} = await customerAccount.mutate(
             DELETE_ADDRESS_MUTATION,
             {
-              variables: {
-                addressId: decodeURIComponent(addressId),
-                language: i18n.language,
-              },
+              variables: {addressId: decodeURIComponent(addressId)},
             },
           );
 

package/dist/assets/hydrogen/starter/app/routes/account.orders.$id.tsx

@@ -17,10 +17,7 @@ export async function loader({params, context}: LoaderFunctionArgs) {
   const {data, errors} = await context.customerAccount.query(
     CUSTOMER_ORDER_QUERY,
     {
-      variables: {
-        orderId,
-        language: context.storefront.i18n.language,
-      },
+      variables: {orderId},
     },
   );
 

package/dist/assets/hydrogen/starter/app/routes/account.orders._index.tsx

@@ -26,7 +26,6 @@ export async function loader({request, context}: LoaderFunctionArgs) {
     {
       variables: {
         ...paginationVariables,
-        language: context.storefront.i18n.language,
       },
     },
   );

package/dist/assets/hydrogen/starter/app/routes/account.profile.tsx

@@ -50,7 +50,6 @@ export async function action({request, context}: ActionFunctionArgs) {
       {
         variables: {
           customer,
-          language: context.storefront.i18n.language,
         },
       },
     );

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

@@ -1,4 +1,3 @@
-
 import {data as remixData, type LoaderFunctionArgs} from '@shopify/remix-oxygen';
 import { Form, NavLink, Outlet, useLoaderData } from 'react-router';
 import {CUSTOMER_DETAILS_QUERY} from '~/graphql/customer-account/CustomerDetailsQuery';
@@ -10,11 +9,6 @@ export function shouldRevalidate() {
 export async function loader({context}: LoaderFunctionArgs) {
   const {data, errors} = await context.customerAccount.query(
     CUSTOMER_DETAILS_QUERY,
-    {
-      variables: {
-        language: context.storefront.i18n.language,
-      },
-    },
   );
 
   if (errors?.length || !data?.customer) {

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

@@ -1,4 +1,4 @@
-import {type MetaFunction, useLoaderData} from 'react-router';
+import { type MetaFunction, useLoaderData } from 'react-router';
 import type {CartQueryDataReturn} from '@shopify/hydrogen';
 import {CartForm} from '@shopify/hydrogen';
 import {

package/dist/assets/hydrogen/starter/customer-accountapi.generated.d.ts

@@ -9,7 +9,6 @@ export type CustomerAddressUpdateMutationVariables = CustomerAccountAPI.Exact<{
   defaultAddress?: CustomerAccountAPI.InputMaybe<
     CustomerAccountAPI.Scalars['Boolean']['input']
   >;
-  language?: CustomerAccountAPI.InputMaybe<CustomerAccountAPI.LanguageCode>;
 }>;
 
 export type CustomerAddressUpdateMutation = {
@@ -28,7 +27,6 @@ export type CustomerAddressUpdateMutation = {
 
 export type CustomerAddressDeleteMutationVariables = CustomerAccountAPI.Exact<{
   addressId: CustomerAccountAPI.Scalars['ID']['input'];
-  language?: CustomerAccountAPI.InputMaybe<CustomerAccountAPI.LanguageCode>;
 }>;
 
 export type CustomerAddressDeleteMutation = {
@@ -52,7 +50,6 @@ export type CustomerAddressCreateMutationVariables = CustomerAccountAPI.Exact<{
   defaultAddress?: CustomerAccountAPI.InputMaybe<
     CustomerAccountAPI.Scalars['Boolean']['input']
   >;
-  language?: CustomerAccountAPI.InputMaybe<CustomerAccountAPI.LanguageCode>;
 }>;
 
 export type CustomerAddressCreateMutation = {
@@ -128,7 +125,7 @@ export type AddressFragment = Pick<
 >;
 
 export type CustomerDetailsQueryVariables = CustomerAccountAPI.Exact<{
-  language?: CustomerAccountAPI.InputMaybe<CustomerAccountAPI.LanguageCode>;
+  [key: string]: never;
 }>;
 
 export type CustomerDetailsQuery = {
@@ -227,7 +224,7 @@ export type OrderLineItemFullFragment = Pick<
 
 export type OrderFragment = Pick<
   CustomerAccountAPI.Order,
-  'id' | 'name' | 'statusPageUrl' | 'fulfillmentStatus' | 'processedAt'
+  'id' | 'name' | 'statusPageUrl' | 'processedAt'
 > & {
   fulfillments: {nodes: Array<Pick<CustomerAccountAPI.Fulfillment, 'status'>>};
   totalTax?: CustomerAccountAPI.Maybe<
@@ -299,14 +296,13 @@ export type OrderFragment = Pick<
 
 export type OrderQueryVariables = CustomerAccountAPI.Exact<{
   orderId: CustomerAccountAPI.Scalars['ID']['input'];
-  language?: CustomerAccountAPI.InputMaybe<CustomerAccountAPI.LanguageCode>;
 }>;
 
 export type OrderQuery = {
   order?: CustomerAccountAPI.Maybe<
     Pick<
       CustomerAccountAPI.Order,
-      'id' | 'name' | 'statusPageUrl' | 'fulfillmentStatus' | 'processedAt'
+      'id' | 'name' | 'statusPageUrl' | 'processedAt'
     > & {
       fulfillments: {
         nodes: Array<Pick<CustomerAccountAPI.Fulfillment, 'status'>>;
@@ -382,7 +378,7 @@ export type OrderQuery = {
 
 export type OrderItemFragment = Pick<
   CustomerAccountAPI.Order,
-  'financialStatus' | 'fulfillmentStatus' | 'id' | 'number' | 'processedAt'
+  'financialStatus' | 'id' | 'number' | 'processedAt'
 > & {
   totalPrice: Pick<CustomerAccountAPI.MoneyV2, 'amount' | 'currencyCode'>;
   fulfillments: {nodes: Array<Pick<CustomerAccountAPI.Fulfillment, 'status'>>};
@@ -393,11 +389,7 @@ export type CustomerOrdersFragment = {
     nodes: Array<
       Pick<
         CustomerAccountAPI.Order,
-        | 'financialStatus'
-        | 'fulfillmentStatus'
-        | 'id'
-        | 'number'
-        | 'processedAt'
+        'financialStatus' | 'id' | 'number' | 'processedAt'
       > & {
         totalPrice: Pick<CustomerAccountAPI.MoneyV2, 'amount' | 'currencyCode'>;
         fulfillments: {
@@ -425,7 +417,6 @@ export type CustomerOrdersQueryVariables = CustomerAccountAPI.Exact<{
   startCursor?: CustomerAccountAPI.InputMaybe<
     CustomerAccountAPI.Scalars['String']['input']
   >;
-  language?: CustomerAccountAPI.InputMaybe<CustomerAccountAPI.LanguageCode>;
 }>;
 
 export type CustomerOrdersQuery = {
@@ -434,11 +425,7 @@ export type CustomerOrdersQuery = {
       nodes: Array<
         Pick<
           CustomerAccountAPI.Order,
-          | 'financialStatus'
-          | 'fulfillmentStatus'
-          | 'id'
-          | 'number'
-          | 'processedAt'
+          'financialStatus' | 'id' | 'number' | 'processedAt'
         > & {
           totalPrice: Pick<
             CustomerAccountAPI.MoneyV2,
@@ -459,7 +446,6 @@ export type CustomerOrdersQuery = {
 
 export type CustomerUpdateMutationVariables = CustomerAccountAPI.Exact<{
   customer: CustomerAccountAPI.CustomerUpdateInput;
-  language?: CustomerAccountAPI.InputMaybe<CustomerAccountAPI.LanguageCode>;
 }>;
 
 export type CustomerUpdateMutation = {
@@ -484,34 +470,34 @@ export type CustomerUpdateMutation = {
 };
 
 interface GeneratedQueryTypes {
-  '#graphql\n  query CustomerDetails($language: LanguageCode) @inContext(language: $language) {\n    customer {\n      ...Customer\n    }\n  }\n  #graphql\n  fragment Customer on Customer {\n    id\n    firstName\n    lastName\n    defaultAddress {\n      ...Address\n    }\n    addresses(first: 6) {\n      nodes {\n        ...Address\n      }\n    }\n  }\n  fragment Address on CustomerAddress {\n    id\n    formatted\n    firstName\n    lastName\n    company\n    address1\n    address2\n    territoryCode\n    zoneCode\n    city\n    zip\n    phoneNumber\n  }\n\n': {
+  '#graphql\n  query CustomerDetails {\n    customer {\n      ...Customer\n    }\n  }\n  #graphql\n  fragment Customer on Customer {\n    id\n    firstName\n    lastName\n    defaultAddress {\n      ...Address\n    }\n    addresses(first: 6) {\n      nodes {\n        ...Address\n      }\n    }\n  }\n  fragment Address on CustomerAddress {\n    id\n    formatted\n    firstName\n    lastName\n    company\n    address1\n    address2\n    territoryCode\n    zoneCode\n    city\n    zip\n    phoneNumber\n  }\n\n': {
     return: CustomerDetailsQuery;
     variables: CustomerDetailsQueryVariables;
   };
-  '#graphql\n  fragment OrderMoney on MoneyV2 {\n    amount\n    currencyCode\n  }\n  fragment DiscountApplication on DiscountApplication {\n    value {\n      __typename\n      ... on MoneyV2 {\n        ...OrderMoney\n      }\n      ... on PricingPercentageValue {\n        percentage\n      }\n    }\n  }\n  fragment OrderLineItemFull on LineItem {\n    id\n    title\n    quantity\n    price {\n      ...OrderMoney\n    }\n    discountAllocations {\n      allocatedAmount {\n        ...OrderMoney\n      }\n      discountApplication {\n        ...DiscountApplication\n      }\n    }\n    totalDiscount {\n      ...OrderMoney\n    }\n    image {\n      altText\n      height\n      url\n      id\n      width\n    }\n    variantTitle\n  }\n  fragment Order on Order {\n    id\n    name\n    statusPageUrl\n    fulfillmentStatus\n    processedAt\n    fulfillments(first: 1) {\n      nodes {\n        status\n      }\n    }\n    totalTax {\n      ...OrderMoney\n    }\n    totalPrice {\n      ...OrderMoney\n    }\n    subtotal {\n      ...OrderMoney\n    }\n    shippingAddress {\n      name\n      formatted(withName: true)\n      formattedArea\n    }\n    discountApplications(first: 100) {\n      nodes {\n        ...DiscountApplication\n      }\n    }\n    lineItems(first: 100) {\n      nodes {\n        ...OrderLineItemFull\n      }\n    }\n  }\n  query Order($orderId: ID!, $language: LanguageCode)\n    @inContext(language: $language) {\n    order(id: $orderId) {\n      ... on Order {\n        ...Order\n      }\n    }\n  }\n': {
+  '#graphql\n  fragment OrderMoney on MoneyV2 {\n    amount\n    currencyCode\n  }\n  fragment DiscountApplication on DiscountApplication {\n    value {\n      __typename\n      ... on MoneyV2 {\n        ...OrderMoney\n      }\n      ... on PricingPercentageValue {\n        percentage\n      }\n    }\n  }\n  fragment OrderLineItemFull on LineItem {\n    id\n    title\n    quantity\n    price {\n      ...OrderMoney\n    }\n    discountAllocations {\n      allocatedAmount {\n        ...OrderMoney\n      }\n      discountApplication {\n        ...DiscountApplication\n      }\n    }\n    totalDiscount {\n      ...OrderMoney\n    }\n    image {\n      altText\n      height\n      url\n      id\n      width\n    }\n    variantTitle\n  }\n  fragment Order on Order {\n    id\n    name\n    statusPageUrl\n    processedAt\n    fulfillments(first: 1) {\n      nodes {\n        status\n      }\n    }\n    totalTax {\n      ...OrderMoney\n    }\n    totalPrice {\n      ...OrderMoney\n    }\n    subtotal {\n      ...OrderMoney\n    }\n    shippingAddress {\n      name\n      formatted(withName: true)\n      formattedArea\n    }\n    discountApplications(first: 100) {\n      nodes {\n        ...DiscountApplication\n      }\n    }\n    lineItems(first: 100) {\n      nodes {\n        ...OrderLineItemFull\n      }\n    }\n  }\n  query Order($orderId: ID!) {\n    order(id: $orderId) {\n      ... on Order {\n        ...Order\n      }\n    }\n  }\n': {
     return: OrderQuery;
     variables: OrderQueryVariables;
   };
-  '#graphql\n  #graphql\n  fragment CustomerOrders on Customer {\n    orders(\n      sortKey: PROCESSED_AT,\n      reverse: true,\n      first: $first,\n      last: $last,\n      before: $startCursor,\n      after: $endCursor\n    ) {\n      nodes {\n        ...OrderItem\n      }\n      pageInfo {\n        hasPreviousPage\n        hasNextPage\n        endCursor\n        startCursor\n      }\n    }\n  }\n  #graphql\n  fragment OrderItem on Order {\n    totalPrice {\n      amount\n      currencyCode\n    }\n    financialStatus\n    fulfillmentStatus\n    fulfillments(first: 1) {\n      nodes {\n        status\n      }\n    }\n    id\n    number\n    processedAt\n  }\n\n\n  query CustomerOrders(\n    $endCursor: String\n    $first: Int\n    $last: Int\n    $startCursor: String\n    $language: LanguageCode\n  ) @inContext(language: $language) {\n    customer {\n      ...CustomerOrders\n    }\n  }\n': {
+  '#graphql\n  #graphql\n  fragment CustomerOrders on Customer {\n    orders(\n      sortKey: PROCESSED_AT,\n      reverse: true,\n      first: $first,\n      last: $last,\n      before: $startCursor,\n      after: $endCursor\n    ) {\n      nodes {\n        ...OrderItem\n      }\n      pageInfo {\n        hasPreviousPage\n        hasNextPage\n        endCursor\n        startCursor\n      }\n    }\n  }\n  #graphql\n  fragment OrderItem on Order {\n    totalPrice {\n      amount\n      currencyCode\n    }\n    financialStatus\n    fulfillments(first: 1) {\n      nodes {\n        status\n      }\n    }\n    id\n    number\n    processedAt\n  }\n\n\n  query CustomerOrders(\n    $endCursor: String\n    $first: Int\n    $last: Int\n    $startCursor: String\n  ) {\n    customer {\n      ...CustomerOrders\n    }\n  }\n': {
     return: CustomerOrdersQuery;
     variables: CustomerOrdersQueryVariables;
   };
 }
 
 interface GeneratedMutationTypes {
-  '#graphql\n  mutation customerAddressUpdate(\n    $address: CustomerAddressInput!\n    $addressId: ID!\n    $defaultAddress: Boolean\n    $language: LanguageCode\n ) @inContext(language: $language) {\n    customerAddressUpdate(\n      address: $address\n      addressId: $addressId\n      defaultAddress: $defaultAddress\n    ) {\n      customerAddress {\n        id\n      }\n      userErrors {\n        code\n        field\n        message\n      }\n    }\n  }\n': {
+  '#graphql\n  mutation customerAddressUpdate(\n    $address: CustomerAddressInput!\n    $addressId: ID!\n    $defaultAddress: Boolean\n ) {\n    customerAddressUpdate(\n      address: $address\n      addressId: $addressId\n      defaultAddress: $defaultAddress\n    ) {\n      customerAddress {\n        id\n      }\n      userErrors {\n        code\n        field\n        message\n      }\n    }\n  }\n': {
     return: CustomerAddressUpdateMutation;
     variables: CustomerAddressUpdateMutationVariables;
   };
-  '#graphql\n  mutation customerAddressDelete(\n    $addressId: ID!\n    $language: LanguageCode\n  ) @inContext(language: $language) {\n    customerAddressDelete(addressId: $addressId) {\n      deletedAddressId\n      userErrors {\n        code\n        field\n        message\n      }\n    }\n  }\n': {
+  '#graphql\n  mutation customerAddressDelete(\n    $addressId: ID!,\n  ) {\n    customerAddressDelete(addressId: $addressId) {\n      deletedAddressId\n      userErrors {\n        code\n        field\n        message\n      }\n    }\n  }\n': {
     return: CustomerAddressDeleteMutation;
     variables: CustomerAddressDeleteMutationVariables;
   };
-  '#graphql\n  mutation customerAddressCreate(\n    $address: CustomerAddressInput!\n    $defaultAddress: Boolean\n    $language: LanguageCode\n  ) @inContext(language: $language) {\n    customerAddressCreate(\n      address: $address\n      defaultAddress: $defaultAddress\n    ) {\n      customerAddress {\n        id\n      }\n      userErrors {\n        code\n        field\n        message\n      }\n    }\n  }\n': {
+  '#graphql\n  mutation customerAddressCreate(\n    $address: CustomerAddressInput!\n    $defaultAddress: Boolean\n  ) {\n    customerAddressCreate(\n      address: $address\n      defaultAddress: $defaultAddress\n    ) {\n      customerAddress {\n        id\n      }\n      userErrors {\n        code\n        field\n        message\n      }\n    }\n  }\n': {
     return: CustomerAddressCreateMutation;
     variables: CustomerAddressCreateMutationVariables;
   };
-  '#graphql\n  mutation customerUpdate(\n    $customer: CustomerUpdateInput!\n    $language: LanguageCode\n  ) @inContext(language: $language) {\n    customerUpdate(input: $customer) {\n      customer {\n        firstName\n        lastName\n        emailAddress {\n          emailAddress\n        }\n        phoneNumber {\n          phoneNumber\n        }\n      }\n      userErrors {\n        code\n        field\n        message\n      }\n    }\n  }\n': {
+  '#graphql\n  # https://shopify.dev/docs/api/customer/latest/mutations/customerUpdate\n  mutation customerUpdate(\n    $customer: CustomerUpdateInput!\n  ){\n    customerUpdate(input: $customer) {\n      customer {\n        firstName\n        lastName\n        emailAddress {\n          emailAddress\n        }\n        phoneNumber {\n          phoneNumber\n        }\n      }\n      userErrors {\n        code\n        field\n        message\n      }\n    }\n  }\n': {
     return: CustomerUpdateMutation;
     variables: CustomerUpdateMutationVariables;
   };

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

@@ -21,8 +21,8 @@
     "isbot": "^5.1.22",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router": "^7.6.0",
-    "react-router-dom": "^7.6.0"
+    "react-router": "7.6.0",
+    "react-router-dom": "7.6.0"
   },
   "devDependencies": {
     "@eslint/compat": "^1.2.5",
@@ -60,4 +60,4 @@
   "engines": {
     "node": ">=18.0.0"
   }
-}
+}

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

@@ -1,20 +1,10 @@
 {
   "include": [
-    "env.d.ts",
-    "app/**/*.ts",
-    "app/**/*.tsx",
-    "app/**/*.d.ts",
-    "*.ts",
-    "*.tsx",
-    "*.d.ts",
+    "./**/*.d.ts",
+    "./**/*.ts",
+    "./**/*.tsx",
     ".react-router/types/**/*"
   ],
-  "exclude": [
-    "node_modules",
-    "dist",
-    "build",
-    "packages/**/dist/**/*"
-  ],
   "compilerOptions": {
     "lib": [
       "DOM",

package/dist/commands/hydrogen/deploy.js

@@ -7,7 +7,7 @@ import { AbortError } from '@shopify/cli-kit/node/error';
 import { writeFile } from '@shopify/cli-kit/node/fs';
 import { ensureIsClean, getLatestGitCommit, GitDirectoryNotCleanError } from '@shopify/cli-kit/node/git';
 import { resolvePath, relativePath } from '@shopify/cli-kit/node/path';
-import { renderWarning, renderSelectPrompt, renderConfirmationPrompt, renderInfo, renderSuccess, renderTasks } from '@shopify/cli-kit/node/ui';
+import { renderWarning, renderSelectPrompt, renderConfirmationPrompt, renderSuccess, renderTasks } from '@shopify/cli-kit/node/ui';
 import { ciPlatform } from '@shopify/cli-kit/node/context/local';
 import { parseToken, createDeploy } from '@shopify/oxygen-cli/deploy';
 import { createRequire } from 'node:module';
@@ -109,11 +109,7 @@ class Deploy extends Command {
       env: "SHOPIFY_HYDROGEN_FLAG_METADATA_VERSION",
       hidden: true
     }),
-    ...commonFlags.diff,
-    "force-client-sourcemap": Flags.boolean({
-      description: "Client sourcemapping is avoided by default because it makes backend code visible in the browser. Use this flag to force enabling it.",
-      env: "SHOPIFY_HYDROGEN_FLAG_FORCE_CLIENT_SOURCEMAP"
-    })
+    ...commonFlags.diff
   };
   async run() {
     const { flags } = await this.parse(Deploy);
@@ -164,7 +160,6 @@ async function runDeploy(options) {
     envBranch,
     environmentFile,
     force: forceOnUncommitedChanges,
-    forceClientSourcemap = false,
     noVerify,
     lockfileCheck,
     jsonOutput,
@@ -439,13 +434,6 @@ Continue?`.value
     }
   };
   if (buildCommand) {
-    if (forceClientSourcemap) {
-      console.log("");
-      renderInfo({
-        headline: "The `--force-client-sourcemap` flag is not supported with a custom build command",
-        body: "Client sourcemaps will not be generated."
-      });
-    }
     config.buildCommand = buildCommand;
   } else {
     hooks.buildFunction = async (assetPath) => {
@@ -460,7 +448,6 @@ Continue?`.value
         assetPath,
         lockfileCheck,
         sourcemap: true,
-        forceClientSourcemap,
         useCodegen: false,
         entry: ssrEntry
       });

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/build.js

@@ -55,9 +55,6 @@ function getSkeletonSourceDir() {
   }
   return joinPath(dirname(monorepoPackagesPath), "templates", "skeleton");
 }
-function getSkeletonNodeModules() {
-  return joinPath(getSkeletonSourceDir(), "node_modules");
-}
 async function getRepoNodeModules() {
   const { stdout } = await execAsync("npm root");
   let nodeModulesPath = stdout.trim();
@@ -67,4 +64,4 @@ async function getRepoNodeModules() {
   return nodeModulesPath;
 }
 
-export { ASSETS_DIR_PREFIX, ASSETS_STARTER_DIR, ASSETS_STARTER_DIR_ROUTES, getAssetsDir, getPkgJsonPath, getRepoNodeModules, getSkeletonNodeModules, getSkeletonSourceDir, getStarterDir, getTemplateAppFile, hydrogenPackagesPath, isHydrogenMonorepo };
+export { ASSETS_DIR_PREFIX, ASSETS_STARTER_DIR, ASSETS_STARTER_DIR_ROUTES, getAssetsDir, getPkgJsonPath, getRepoNodeModules, getSkeletonSourceDir, getStarterDir, getTemplateAppFile, hydrogenPackagesPath, isHydrogenMonorepo };

package/dist/lib/codegen.js

@@ -1,7 +1,7 @@
 import { spawn } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { getCodeFormatOptions, formatCode } from './format-code.js';
-import { renderWarning } from '@shopify/cli-kit/node/ui';
+import { renderInfo, renderWarning } from '@shopify/cli-kit/node/ui';
 import { relativePath, resolvePath, joinPath, basename } from '@shopify/cli-kit/node/path';
 import { AbortError } from '@shopify/cli-kit/node/error';
 import { importLocal } from './import-utils.js';
@@ -71,7 +71,7 @@ function spawnCodegenProcess({
     if (/\.body\[\d\]/.test(message)) return;
     if (/console\.time(End)?\(\)/.test(message)) return;
     if (/─ (warning|info|success) ───/.test(message)) return;
-    console.log("");
+    renderInfo({ body: "" });
     renderWarning({ headline: message, body: details });
   });
   child.on("close", (code) => {
@@ -97,6 +97,15 @@ async function codegen(options) {
 }
 async function executeReactRouterCodegen(options) {
   const { execSync, exec } = await import('child_process');
+  try {
+    execSync("npx react-router --version", {
+      cwd: options.rootDirectory,
+      stdio: "ignore"
+    });
+  } catch {
+    renderInfo({ body: "React Router not found, skipping typegen" });
+    return;
+  }
   if (options.watch) {
     exec("npx react-router typegen --watch", {
       cwd: options.rootDirectory
@@ -301,4 +310,4 @@ async function addHooksToHydrogenOptions(codegenConfig, { rootDirectory }) {
   }
 }
 
-export { codegen, generateDefaultConfig, spawnCodegenProcess };
+export { codegen, executeReactRouterCodegen, generateDefaultConfig, spawnCodegenProcess };

package/dist/lib/import-utils.js

@@ -10,10 +10,7 @@ async function importVite(root) {
     process.env.SHOPIFY_UNIT_TEST ? void 0 : { paths: [root] }
   );
   const vitePackageJson = await findUpAndReadPackageJson(vitePath);
-  let viteNodeIndexFile = vitePackageJson.content.exports?.["."];
-  if (typeof viteNodeIndexFile !== "string") {
-    viteNodeIndexFile = viteNodeIndexFile?.import;
-  }
+  let viteNodeIndexFile = vitePackageJson.content.exports?.["."].import;
   if (typeof viteNodeIndexFile !== "string") {
     viteNodeIndexFile = viteNodeIndexFile.default;
   }

package/dist/lib/onboarding/setup-template.mocks.js

@@ -2,7 +2,7 @@ import { rm, symlink } from 'node:fs/promises';
 import { vi } from 'vitest';
 import { writeFile } from '@shopify/cli-kit/node/fs';
 import { dirname, joinPath } from '@shopify/cli-kit/node/path';
-import { getSkeletonSourceDir, getSkeletonNodeModules } from '../build.js';
+import { getSkeletonSourceDir, getRepoNodeModules } from '../build.js';
 
 const { renderTasksHook } = vi.hoisted(() => ({ renderTasksHook: vi.fn() }));
 vi.mock("../template-downloader.js", async () => ({
@@ -43,13 +43,15 @@ vi.mock(
         renderTasksHook.mockImplementationOnce(async () => {
           await writeFile(`${directory}/package-lock.json`, "{}");
         });
-        const targetNodeModules = joinPath(directory, "node_modules");
-        await rm(targetNodeModules, {
+        await rm(joinPath(directory, "node_modules"), {
           force: true,
           recursive: true
         }).catch(() => {
         });
-        await symlink(await getSkeletonNodeModules(), targetNodeModules);
+        await symlink(
+          await getRepoNodeModules(),
+          joinPath(directory, "node_modules")
+        );
       })
     };
   }

package/dist/lib/template-diff.js

@@ -45,8 +45,7 @@ ${colors.dim(
         "**/*.generated.d.ts",
         "**/package.json",
         "**/tsconfig.json",
-        "**/.shopify",
-        "**/.gitignore"
+        "**/.shopify"
       ]
     }).on("all", async (eventName, eventFilePath) => {
       const targetFile = joinPath(
@@ -172,7 +171,7 @@ async function applyTemplateDiff(targetDirectory, diffDirectory, templateDir) {
     force: true,
     recursive: true,
     filter: createFilter(
-      /(^|\/|\\)(dist|node_modules|\.cache|\.turbo|package\.json|tsconfig\.json|\.gitignore)(\/|\\|$)/i
+      /(^|\/|\\)(dist|node_modules|\.cache|.turbo|package\.json|tsconfig\.json)(\/|\\|$)/i
     )
   });
   await mergePackageJson(diffDirectory, targetDirectory, {

package/oclif.manifest.json

@@ -503,13 +503,6 @@
           "required": false,
           "allowNo": false,
           "type": "boolean"
-        },
-        "force-client-sourcemap": {
-          "description": "Client sourcemapping is avoided by default because it makes backend code visible in the browser. Use this flag to force enabling it.",
-          "env": "SHOPIFY_HYDROGEN_FLAG_FORCE_CLIENT_SOURCEMAP",
-          "name": "force-client-sourcemap",
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -1735,5 +1728,5 @@
       ]
     }
   },
-  "version": "11.1.1"
+  "version": "11.1.3"
 }

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "@shopify:registry": "https://registry.npmjs.org"
   },
-  "version": "11.1.1",
+  "version": "11.1.3",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -37,7 +37,7 @@
     "vitest": "^1.0.4"
   },
   "dependencies": {
-    "@ast-grep/napi": "0.34.1",
+    "@ast-grep/napi": "0.11.0",
     "@oclif/core": "3.26.5",
     "@shopify/cli-kit": "^3.80.4",
     "@shopify/oxygen-cli": "4.6.18",