Merge branch 'main' into hl-gift-card-remove

Shopify · Jan 24, 2025 · 4ad329e · 4ad329e
2 parents 9a85487 + e90bc58
commit 4ad329e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.changeset/thick-lamps-attend.md b/.changeset/thick-lamps-attend.md
@@ -0,0 +1,9 @@
+---
+'@shopify/hydrogen-react': patch
+'skeleton': patch
+'@shopify/hydrogen': patch
+'@shopify/cli-hydrogen': patch
+'@shopify/create-hydrogen': patch
+---
+
+Bump SFAPI to 2025-01
diff --git a/.github/workflows/changesets.yml b/.github/workflows/changesets.yml
@@ -25,7 +25,7 @@ jobs:
         id: flags
         run: |
           # IMPORTANT: Update this latestBranch whenever we move to a new major version:
-          echo "latestBranch=2024-10" >> $GITHUB_ENV
+          echo "latestBranch=2025-01" >> $GITHUB_ENV
           echo "latest=${{ github.ref_name == 'main' }}" >> $GITHUB_ENV
 
       - name: Checkout the code

diff --git a/packages/hydrogen/src/customer/types.ts b/packages/hydrogen/src/customer/types.ts
@@ -59,7 +59,7 @@ export type LogoutOptions = {
 };
 
 export type CustomerAccount = {
-  /** Start the OAuth login flow. This function should be called and returned from a Remix action.
+  /** Start the OAuth login flow. This function should be called and returned from a Remix loader.
    * It redirects the customer to a Shopify login domain. It also defined the final path the customer
    * lands on at the end of the oAuth flow with the value of the `return_to` query param. (This is
    * automatically setup unless `customAuthStatusHandler` option is in use)