Merge branch 'main' into december-updates

bigcommerce · Dec 7, 2023 · 1bd4045 · 1bd4045
2 parents 01f2755 + c3cc1a4
commit 1bd4045
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 28 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,6 +11,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
+      - name: Cancel running workflows
+        uses: styfle/cancel-workflow-action@0.12.0
+        with:
+          access_token: ${{ github.token }}
       - name: Checkout repo
         uses: actions/checkout@v4
       - name: Set node version

diff --git a/components/cart/actions.ts b/components/cart/actions.ts
@@ -1,7 +1,7 @@
 'use server';
 
-import { addToCart, removeFromCart, updateCart } from 'lib/bigcommerce';
 import { TAGS } from 'lib/constants';
+import { addToCart, removeFromCart, updateCart } from 'lib/bigcommerce';
 import { revalidateTag } from 'next/cache';
 import { cookies } from 'next/headers';
 

diff --git a/lib/bigcommerce/types.ts b/lib/bigcommerce/types.ts
@@ -492,10 +492,7 @@ export type DigitalOrPhysicalItem = {
 
 export type CartCustomItem = {
   entityId: string;
-<<<<<<< HEAD
   productEntityId: undefined;
-=======
->>>>>>> b17652b (feat: project initial setup)
   sku: string;
   name: string;
   quantity: number;
@@ -505,10 +502,7 @@ export type CartCustomItem = {
 
 type CartGiftCertificate = {
   entityId: number;
-<<<<<<< HEAD
   productEntityId: undefined;
-=======
->>>>>>> b17652b (feat: project initial setup)
   name: string;
   amount: BigCommerceMoney;
   isTaxable: boolean;

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml