Merge branch 'develop' into chore/add-ver-desc-to-minor-release-pipeline

SAP · Oct 24, 2024 · af12bdb · af12bdb
2 parents 1b91ceb + c812aae
commit af12bdb
Show file tree

Hide file tree

Showing 95 changed files with 956 additions and 707 deletions.
diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/setup",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Includes features that makes Spartacus and it's setup easier and streamlined.",
   "keywords": [
     "spartacus",
@@ -21,10 +21,10 @@
   "peerDependencies": {
     "@angular/core": "^17.0.5",
     "@angular/ssr": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/user": "2211.29.1"
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/user": "2211.30.0"
   },
   "optionalDependencies": {
     "@angular/platform-server": "^17.0.5",

diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/asm",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "ASM feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,14 +32,14 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefinder": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefinder": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/asm/styles/components/_asm-main-ui.component.scss b/feature-libs/asm/styles/components/_asm-main-ui.component.scss
@@ -89,8 +89,6 @@
 
   // Top Bar
   .asm-bar {
-    color: #fff;
-    background-color: #354a5f;
     height: 48px;
     display: flex;
     padding: 0 2rem;

diff --git a/feature-libs/asm/styles/components/_customer-selection.component.scss b/feature-libs/asm/styles/components/_customer-selection.component.scss
@@ -41,7 +41,6 @@
 
       @media (min-width: 575px) {
         margin-inline-end: 15px;
-        min-width: 20rem;
         margin-bottom: 0;
         min-width: 25rem;
       }

diff --git a/feature-libs/cart/base/styles/components/_item-counter.scss b/feature-libs/cart/base/styles/components/_item-counter.scss
@@ -13,6 +13,7 @@
       -moz-appearance: textfield;
     }
   }
+
   &.readonly {
     button {
       display: none;
@@ -77,8 +78,17 @@
       font-weight: var(--cx-font-weight-bold);
     }
 
+    // TODO: The styles for ":disabled" selector should be deleted when "a11yItemCounterFocus" feature flag has been removed
     &:disabled {
       color: var(--cx-color-light);
+      cursor: not-allowed;
+    }
+
+    @include forFeature('a11yItemCounterFocus') {
+      &[aria-disabled='true'] {
+        color: var(--cx-color-light);
+        cursor: not-allowed;
+      }
     }
 
     @include forFeature('a11yImproveContrast') {
@@ -90,9 +100,15 @@
       &:focus {
         box-shadow: 0 0 0 0;
       }
+      // TODO: The styles for ":disabled" selector should be deleted when "a11yItemCounterFocus" feature flag has been removed
       &:disabled {
         color: var(--cx-color-dark);
       }
+      @include forFeature('a11yItemCounterFocus') {
+        &[aria-disabled='true'] {
+          color: var(--cx-color-dark);
+        }
+      }
     }
   }
 

diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cart",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "",
   "keywords": [
     "spartacus",
@@ -37,11 +37,11 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },

diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/checkout",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Checkout feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,13 +32,13 @@
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },

diff --git a/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap b/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap
@@ -63,7 +63,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -514,7 +514,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })

diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/customer-ticketing",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Customer-Ticketing library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,11 +30,11 @@
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/estimated-delivery-date/package.json b/feature-libs/estimated-delivery-date/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/estimated-delivery-date",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Estimated Delivery Date library for Spartacus",
   "keywords": [
     "spartacus",
@@ -28,12 +28,12 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/order/package.json b/feature-libs/order/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/order",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Order feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/pdf-invoices": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/pdf-invoices": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/organization/package.json b/feature-libs/organization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/organization",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Organization library for Spartacus",
   "keywords": [
     "spartacus",
@@ -33,13 +33,13 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },

diff --git a/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap b/feature-libs/organization/schematics/add-organization/__snapshots__/index_spec.ts.snap
@@ -51,7 +51,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -270,7 +270,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -489,7 +489,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -708,7 +708,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -927,7 +927,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '2211.29'
+      level: '2211.30'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })

diff --git a/feature-libs/pdf-invoices/package.json b/feature-libs/pdf-invoices/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/pdf-invoices",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "Invoices library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,10 +29,10 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/pickup-in-store/package.json b/feature-libs/pickup-in-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/pickup-in-store",
-  "version": "2211.29.1",
+  "version": "2211.30.0",
   "description": "",
   "keywords": [
     "spartacus",
@@ -32,14 +32,14 @@
     "@angular/router": "^17.0.5",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.1",
-    "@spartacus/core": "2211.29.1",
-    "@spartacus/order": "2211.29.1",
-    "@spartacus/schematics": "2211.29.1",
-    "@spartacus/storefinder": "2211.29.1",
-    "@spartacus/storefront": "2211.29.1",
-    "@spartacus/styles": "2211.29.1",
-    "@spartacus/user": "2211.29.1",
+    "@spartacus/cart": "2211.30.0",
+    "@spartacus/core": "2211.30.0",
+    "@spartacus/order": "2211.30.0",
+    "@spartacus/schematics": "2211.30.0",
+    "@spartacus/storefinder": "2211.30.0",
+    "@spartacus/storefront": "2211.30.0",
+    "@spartacus/styles": "2211.30.0",
+    "@spartacus/user": "2211.30.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },