Merge branch 'develop' into epic/punchout

Author: FollowTheFlo

.eslintignore

@@ -0,0 +1 @@
+index.d.ts

.eslintrc.json

@@ -78,6 +78,7 @@
           "error",
           {
             "allow": [],
+            "allowCircularSelfDependency": true,
             "depConstraints": [
               {
                 "sourceTag": "*",

.github/workflows/ci-merge-checks.yml

@@ -7,21 +7,20 @@ on:
       - release-*
   workflow_dispatch:
     # empty as it is used only to manually trigger the workflow
-  
+
 env:
   CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }}
   GH_TOKEN: ${{ github.token }}
   NODE_VERSION: '20'
-  AMP_API_TOKEN: ${{ secrets.AMP_API_TOKEN }}
   CONTINUUM_REGISTRY_TOKEN: ${{ secrets.CONTINUUM_REGISTRY_TOKEN }}
 
-concurrency: 
+concurrency:
   group: ci-merge-checks-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
 name: Merge Checks
 jobs:
-  no_retries: 
+  no_retries:
     name: MC - Prevent retries
     # E2Es can't be retried.  Moreover, in some retry cases, they don't run
     # and the job returns a success code.
@@ -31,20 +30,20 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            core.setFailed('Please push a commit to trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`') 
+            core.setFailed('Please push a commit to trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`')
         if: ${{ github.run_attempt > 1 }}
   validate_e2e_execution:
     name: MC - Confirm e2es should run
     runs-on: ubuntu-latest
-    outputs: 
+    outputs:
       SHOULD_RUN_E2E: ${{ steps.save-e2e-output-result.outputs.SHOULD_RUN_E2E }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Determine whether to run e2es
         id: save-e2e-output-result
-        run: |         
+        run: |
           source ci-scripts/validate-e2e-execution.sh
           echo "::set-output name=SHOULD_RUN_E2E::$(echo $RUN_E2E)"
   b2c_e2e_tests:
@@ -60,7 +59,7 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            core.setFailed('Please push a commit to trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`') 
+            core.setFailed('Please push a commit to trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`')
         if: ${{ github.run_attempt > 1 }}
       - uses: actions/checkout@v4
       - name: Setup node
@@ -71,14 +70,14 @@ jobs:
         id: cache-node-modules
         uses: actions/cache@v4
         with:
-          path: | 
+          path: |
             node_modules
             projects/storefrontapp-e2e-cypress/node_modules
             ~/.cache/Cypress
           key: nodemodules-${{ github.event.pull_request.base.sha }}
           restore-keys: nodemodules-${{ github.event.pull_request.base.sha }}
       - name: Run e2es
-        env: 
+        env:
           SPA_ENV: ci,b2c
           BUILD_NUMBER: ci-build-number-${{ github.event.pull_request.head.sha || github.run_id }}
         run: |
@@ -93,7 +92,7 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            core.setFailed('Please push a commit to trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`') 
+            core.setFailed('Please push a commit to trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`')
         if: ${{ github.run_attempt > 1 }}
       - uses: actions/checkout@v4
       - name: Setup node
@@ -104,14 +103,14 @@ jobs:
         id: cache-node-modules
         uses: actions/cache@v4
         with:
-          path: | 
+          path: |
             node_modules
             projects/storefrontapp-e2e-cypress/node_modules
             ~/.cache/Cypress
           key: nodemodules-${{ github.event.pull_request.base.sha }}
           restore-keys: nodemodules-${{ github.event.pull_request.base.sha }}
       - name: Run e2es
-        env: 
+        env:
           SPA_ENV: ci,b2c
           BUILD_NUMBER: ci-build-number-${{ github.event.pull_request.head.sha || github.run_id }}
         run: |
@@ -129,7 +128,7 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            core.setFailed('Please push a commit to trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`') 
+            core.setFailed('Please push a commit to trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`')
         if: ${{ github.run_attempt > 1 }}
       - uses: actions/checkout@v4
       - name: Setup node
@@ -140,7 +139,7 @@ jobs:
         id: cache-node-modules
         uses: actions/cache@v4
         with:
-          path: | 
+          path: |
             node_modules
             projects/storefrontapp-e2e-cypress/node_modules
             ~/.cache/Cypress
@@ -150,7 +149,7 @@ jobs:
         env:
           SPA_ENV: ci,b2b
           BUILD_NUMBER: ci-build-number-${{ github.event.pull_request.head.sha || github.run_id }}
-        run: |     
+        run: |
           ci-scripts/e2e-cypress.sh -s b2b
   merge_checks_result:
     needs: [b2c_e2e_tests, b2c_ssr_e2e_tests, b2b_e2e_tests]
@@ -167,11 +166,11 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               body: `# Merge Checks Failed
-                Please push a commit to re-trigger the build. 
+                Please push a commit to re-trigger the build.
                 To push an empty commit you can use \`git commit --allow-empty -m "Trigger Build"\``
             })
             core.setFailed('Please push a commit to re-trigger the build. To push an empty commit you can use `git commit --allow-empty -m "Trigger Build"`')
         if: |
           needs.b2c_e2e_tests.result == 'failure' || needs.b2c_e2e_tests.result == 'cancelled' ||
-          needs.b2c_ssr_e2e_tests.result == 'failure' || needs.b2c_ssr_e2e_tests.result == 'cancelled' || 
+          needs.b2c_ssr_e2e_tests.result == 'failure' || needs.b2c_ssr_e2e_tests.result == 'cancelled' ||
           needs.b2b_e2e_tests.result == 'failure' || needs.b2b_e2e_tests.result == 'cancelled'

.github/workflows/ci.yml

@@ -10,7 +10,6 @@ on:
 env:
   CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }}
   NODE_VERSION: '20'
-  AMP_API_TOKEN: ${{ secrets.AMP_API_TOKEN }}
   CONTINUUM_REGISTRY_TOKEN: ${{ secrets.CONTINUUM_REGISTRY_TOKEN }}
 
 concurrency:
@@ -232,7 +231,7 @@ jobs:
         id: cache-node-modules
         uses: actions/cache@v4
         with:
-          path: | 
+          path: |
             node_modules
           key: nodemodules-${{ github.event.pull_request.base.sha }}
           restore-keys: nodemodules-${{ github.event.pull_request.base.sha }}

.stylelintrc.json

@@ -38,14 +38,9 @@
       "margin-inline"
     ],
     "declaration-property-value-disallowed-list": {
-      "text-align": [
-        "right",
-        "left"
-      ]
+      "text-align": ["right", "left"]
     },
     "scss/comment-no-loud": true
   },
-  "ignoreFiles": [
-    "projects/storefrontstyles/vendor/**/*.scss"
-  ]
+  "ignoreFiles": ["projects/storefrontstyles/vendor/**/*.scss"]
 }

core-libs/setup/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/setup",
-  "version": "2211.37.0-1",
+  "version": "2211.37.0",
   "description": "Includes features that makes Spartacus and it's setup easier and streamlined.",
   "keywords": [
     "spartacus",
@@ -19,15 +19,15 @@
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@angular/core": "^19.0.3",
-    "@angular/ssr": "^19.0.4",
-    "@spartacus/cart": "2211.37.0-1",
-    "@spartacus/core": "2211.37.0-1",
-    "@spartacus/order": "2211.37.0-1",
-    "@spartacus/user": "2211.37.0-1"
+    "@angular/core": "^19.1.8",
+    "@angular/ssr": "^19.1.9",
+    "@spartacus/cart": "2211.37.0",
+    "@spartacus/core": "2211.37.0",
+    "@spartacus/order": "2211.37.0",
+    "@spartacus/user": "2211.37.0"
   },
   "optionalDependencies": {
-    "@angular/platform-server": "^19.0.3",
+    "@angular/platform-server": "^19.1.8",
     "express": "^4.21.2"
   },
   "engines": {

core-libs/setup/ssr/engine/__snapshots__/cx-common-engine.spec.ts.snap

@@ -7,6 +7,6 @@ exports[`CxCommonEngine should handle APP_INITIALIZER errors the standard Angula
 
 exports[`CxCommonEngine should handle errors propagated from SSR 1`] = `"test error"`;
 
-exports[`CxCommonEngine should not override providers passed to options 1`] = `"<html data-beasties-container><head></head><body><cx-token ng-version="19.0.3" ng-server-context="ssr">message:test</cx-token></body></html>"`;
+exports[`CxCommonEngine should not override providers passed to options 1`] = `"<html data-beasties-container><head></head><body><cx-token ng-version="19.1.8" ng-server-context="ssr">message:test</cx-token></body></html>"`;
 
-exports[`CxCommonEngine should return html if no errors 1`] = `"<html data-beasties-container><head></head><body><cx-mock ng-version="19.0.3" ng-server-context="ssr">some template</cx-mock></body></html>"`;
+exports[`CxCommonEngine should return html if no errors 1`] = `"<html data-beasties-container><head></head><body><cx-mock ng-version="19.1.8" ng-server-context="ssr">some template</cx-mock></body></html>"`;

feature-libs/asm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/asm",
-  "version": "2211.37.0-1",
+  "version": "2211.37.0",
   "description": "ASM feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -25,21 +25,21 @@
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^19.0.4",
-    "@angular/common": "^19.0.3",
-    "@angular/core": "^19.0.3",
-    "@angular/forms": "^19.0.3",
+    "@angular-devkit/schematics": "^19.1.9",
+    "@angular/common": "^19.1.8",
+    "@angular/core": "^19.1.8",
+    "@angular/forms": "^19.1.8",
     "@ng-select/ng-select": "^14.1.0",
-    "@ngrx/effects": "^19.0.0",
-    "@ngrx/store": "^19.0.0",
-    "@spartacus/cart": "2211.37.0-1",
-    "@spartacus/core": "2211.37.0-1",
-    "@spartacus/order": "2211.37.0-1",
-    "@spartacus/schematics": "2211.37.0-1",
-    "@spartacus/storefinder": "2211.37.0-1",
-    "@spartacus/storefront": "2211.37.0-1",
-    "@spartacus/styles": "2211.37.0-1",
-    "@spartacus/user": "2211.37.0-1",
+    "@ngrx/effects": "^19.0.1",
+    "@ngrx/store": "^19.0.1",
+    "@spartacus/cart": "2211.37.0",
+    "@spartacus/core": "2211.37.0",
+    "@spartacus/order": "2211.37.0",
+    "@spartacus/schematics": "2211.37.0",
+    "@spartacus/storefinder": "2211.37.0",
+    "@spartacus/storefront": "2211.37.0",
+    "@spartacus/styles": "2211.37.0",
+    "@spartacus/user": "2211.37.0",
     "rxjs": "^7.8.0"
   },
   "engines": {

feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html

@@ -6,9 +6,7 @@
         '!a11yDisabledCouponAndQuickOrderActionButtonsInsteadOfRequiredFields'
       "
     >
-      <p *cxFeature="'a11yRequiredAsterisks'" class="form-legend">
-        {{ 'formLegend.required' | cxTranslate }}
-      </p>
+      <cx-form-required-legend />
     </ng-container>
 
     <form (ngSubmit)="applyVoucher()" [formGroup]="couponForm">

feature-libs/cart/base/components/cart-coupon/cart-coupon.module.ts

@@ -14,7 +14,11 @@ import {
   I18nModule,
   provideDefaultConfig,
 } from '@spartacus/core';
-import { FormErrorsModule, IconModule } from '@spartacus/storefront';
+import {
+  FormErrorsModule,
+  FormRequiredLegendComponent,
+  IconModule,
+} from '@spartacus/storefront';
 import { AppliedCouponsComponent } from './applied-coupons/applied-coupons.component';
 import { CartCouponComponent } from './cart-coupon.component';
 
@@ -30,6 +34,7 @@ import { CartCouponComponent } from './cart-coupon.component';
     IconModule,
     FormErrorsModule,
     FeaturesConfigModule,
+    FormRequiredLegendComponent,
   ],
   providers: [
     provideDefaultConfig(<CmsConfig>{

feature-libs/cart/base/styles/components/_item-counter.scss

@@ -76,6 +76,9 @@
       color: var(--cx-color, var(--cx-color-primary));
       cursor: pointer;
       font-weight: var(--cx-font-weight-bold);
+      @include forFeature('a11yVisibleFocusOverflows') {
+        z-index: 10;
+      }
     }
 
     // TODO: The styles for ":disabled" selector should be deleted when "a11yItemCounterFocus" feature flag has been removed

feature-libs/cart/import-export/components/import-to-cart/import-entries-dialog/import-to-new-saved-cart-form/import-to-new-saved-cart-form.component.html

@@ -14,15 +14,13 @@
       ></cx-message>
     </div>
   </ng-container>
-  <p *cxFeature="'a11yRequiredAsterisks'" class="form-legend">
-    {{ 'formLegend.required' | cxTranslate }}
-  </p>
+  <cx-form-required-legend />
   <p class="cx-import-entries-subtitle">
     {{ 'importEntriesDialog.importProductsNewSavedCartSubtitle' | cxTranslate }}
   </p>
   <p>
     {{ 'importEntriesDialog.importProductFileDetails' | cxTranslate }}
-    <ng-template [ngTemplateOutlet]="requiredAsterisk"></ng-template>
+    <cx-form-required-asterisks />
   </p>
   <label>
     <cx-file-upload
@@ -41,7 +39,7 @@
     <label>
       <span class="cx-import-entries-label label-content">
         {{ 'importEntriesDialog.savedCartName' | cxTranslate }}
-        <ng-template [ngTemplateOutlet]="requiredAsterisk"></ng-template>
+        <cx-form-required-asterisks />
       </span>
       <input
         [maxLength]="nameMaxLength"
@@ -100,13 +98,3 @@
     </button>
   </div>
 </form>
-
-<ng-template #requiredAsterisk>
-  <abbr
-    *cxFeature="'a11yRequiredAsterisks'"
-    class="text-decoration-none required-asterisk"
-    aria-hidden="true"
-    title="{{ 'common.required' | cxTranslate }}"
-    >*</abbr
-  >
-</ng-template>

feature-libs/cart/import-export/components/import-to-cart/import-order-entries.module.ts

@@ -17,6 +17,8 @@ import {
 import {
   FileUploadModule,
   FormErrorsModule,
+  FormRequiredAsterisksComponent,
+  FormRequiredLegendComponent,
   IconModule,
   KeyboardFocusModule,
   MessageComponentModule,
@@ -34,6 +36,8 @@ import { ImportOrderEntriesComponent } from './import-entries/import-order-entri
     FormsModule,
     ReactiveFormsModule,
     FormErrorsModule,
+    FormRequiredAsterisksComponent,
+    FormRequiredLegendComponent,
     IconModule,
     KeyboardFocusModule,
     FileUploadModule,