Merge remote-tracking branch 'origin/develop' into pdp-containers

hlxsites · Nov 22, 2024 · 168d3f2 · 168d3f2
2 parents f693623 + d8df840
commit 168d3f2
Show file tree

Hide file tree

Showing 620 changed files with 9,834 additions and 40,346 deletions.
diff --git a/404.html b/404.html
@@ -7,10 +7,11 @@
     {
         "imports": {
             "@dropins/tools/": "/scripts/__dropins__/tools/",
-            "@dropins/storefront-pdp/": "/scripts/__dropins__/storefront-pdp/"
+            "@dropins/storefront-cart/": "/scripts/__dropins__/storefront-cart/",
+            "@dropins/storefront-auth/": "/scripts/__dropins__/storefront-auth/"
         }
     }
-  </script>
+</script>
   <script type="text/javascript">
     window.isErrorPage = true;
     window.errorCode = '404';

diff --git a/blocks/commerce-account-sidebar/commerce-account-sidebar.css b/blocks/commerce-account-sidebar/commerce-account-sidebar.css
@@ -9,8 +9,8 @@
     align-items: center;
     padding: var(--spacing-medium);
     margin-bottom: var(--spacing-small);
-    border: var(--shape-border-width-1) solid var(--color-neutral-400);
-    border-radius: var(--shape-border-radius-1);
+    border: var(--shape-border-width-2) solid var(--color-neutral-400);
+    border-radius: var(--shape-border-radius-2);
     text-decoration: none;
 }
 

diff --git a/blocks/commerce-cart/commerce-cart.js b/blocks/commerce-cart/commerce-cart.js
@@ -7,6 +7,7 @@ import CartSummaryList from '@dropins/storefront-cart/containers/CartSummaryList
 import OrderSummary from '@dropins/storefront-cart/containers/OrderSummary.js';
 import EstimateShipping from '@dropins/storefront-cart/containers/EstimateShipping.js';
 import EmptyCart from '@dropins/storefront-cart/containers/EmptyCart.js';
+import Coupons from '@dropins/storefront-cart/containers/Coupons.js';
 
 // Initializers
 import '../../scripts/initializers/cart.js';
@@ -90,6 +91,13 @@ export default async function decorate(block) {
             ctx.replaceWith(wrapper);
           }
         },
+        Coupons: (ctx) => {
+          const coupons = document.createElement('div');
+
+          provider.render(Coupons)(coupons);
+
+          ctx.appendChild(coupons);
+        },
       },
     })($summary),