From cbff3319dcf5746199002e5ab895da042af93fc0 Mon Sep 17 00:00:00 2001
From: PioBar <72926984+Pio-Bar@users.noreply.github.com>
Date: Fri, 4 Oct 2024 10:52:45 +0200
Subject: [PATCH 1/5] fix: (CXSPA-7958) - Dialog trigger refocus (#19240)

---
 .../add-to-cart/add-to-cart.component.html    |  1 +
 .../add-to-cart/add-to-cart.component.ts      | 14 +++-
 .../added-to-cart-dialog-event.listener.ts    |  2 +-
 .../cart/base/root/events/cart.events.ts      |  6 ++
 ...dp-pickup-options-container.component.html |  2 +-
 ...pickup-options-container.component.spec.ts | 18 ++++-
 .../pdp-pickup-options-container.component.ts | 73 +++++++++++++++----
 .../pickup-options.component.html             |  4 +
 .../pickup-options.component.spec.ts          | 16 +++-
 .../pickup-options.component.ts               | 33 +++++++--
 .../feature-toggles/config/feature-toggles.ts |  7 ++
 .../accessibility/focus-management.e2e.cy.ts  | 18 +++++
 .../spartacus/spartacus-features.module.ts    |  1 +
 13 files changed, 167 insertions(+), 28 deletions(-)

diff --git a/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.html b/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.html
index 57060104fee..cea53d5837f 100644
--- a/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.html
+++ b/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.html
@@ -27,6 +27,7 @@
   </ng-container>
 
   <button
+    #addToCartDialogTriggerEl
     *ngIf="hasStock"
     [ngClass]="
       options?.displayAddToCart
diff --git a/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.ts b/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.ts
index ab786e879da..e3d92ed3acd 100644
--- a/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.ts
+++ b/feature-libs/cart/base/components/add-to-cart/add-to-cart.component.ts
@@ -9,11 +9,13 @@ import {
   ChangeDetectorRef,
   Component,
   ComponentRef,
+  ElementRef,
   HostListener,
   Input,
   OnDestroy,
   OnInit,
   Optional,
+  ViewChild,
   inject,
 } from '@angular/core';
 import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
@@ -55,6 +57,11 @@ export class AddToCartComponent implements OnInit, OnDestroy {
    */
   @Input() product: Product;
 
+  /**
+   * Element responsible for opening the modal. The reference is used to refocus the modal after it closes.
+   */
+  @ViewChild('addToCartDialogTriggerEl') addToCartDialogTriggerEl: ElementRef;
+
   maxQuantity: number;
 
   hasStock: boolean = false;
@@ -77,9 +84,7 @@ export class AddToCartComponent implements OnInit, OnDestroy {
 
   iconTypes = ICON_TYPE;
 
-  @Optional() featureConfigService = inject(FeatureConfigService, {
-    optional: true,
-  });
+  private featureConfigService = inject(FeatureConfigService);
 
   /**
    * We disable the dialog launch on quantity input,
@@ -228,6 +233,9 @@ export class AddToCartComponent implements OnInit, OnDestroy {
     newEvent.quantity = quantity;
     newEvent.numberOfEntriesBeforeAdd = numberOfEntriesBeforeAdd;
     newEvent.pickupStoreName = storeName;
+    if (this.featureConfigService.isEnabled('a11yDialogTriggerRefocus')) {
+      newEvent.triggerElementRef = this.addToCartDialogTriggerEl;
+    }
     return newEvent;
   }
 
diff --git a/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog-event.listener.ts b/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog-event.listener.ts
index 59fb7509eed..39c5d7450da 100644
--- a/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog-event.listener.ts
+++ b/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog-event.listener.ts
@@ -56,7 +56,7 @@ export class AddedToCartDialogEventListener implements OnDestroy {
 
     const dialog = this.launchDialogService.openDialog(
       LAUNCH_CALLER.ADDED_TO_CART,
-      undefined,
+      event?.triggerElementRef,
       undefined,
       addToCartData
     );
diff --git a/feature-libs/cart/base/root/events/cart.events.ts b/feature-libs/cart/base/root/events/cart.events.ts
index 253b7ba9285..eeb4de4ec8a 100644
--- a/feature-libs/cart/base/root/events/cart.events.ts
+++ b/feature-libs/cart/base/root/events/cart.events.ts
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { ElementRef } from '@angular/core';
 import { CxEvent } from '@spartacus/core';
 import { OrderEntry } from '../models/cart.model';
 
@@ -127,6 +128,11 @@ export class CartUiEventAddToCart extends CxEvent {
   quantity: number;
   numberOfEntriesBeforeAdd: number;
   pickupStoreName?: string;
+  /**
+   * Since the event can be used to open a dialog, we need to know which element triggered it.
+   * This way we can refocus on it after the dialog is closed.
+   */
+  triggerElementRef?: ElementRef;
 }
 
 /**
diff --git a/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.html b/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.html
index 45914c3b975..31c10993406 100644
--- a/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.html
+++ b/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.html
@@ -3,6 +3,6 @@
     [selectedOption]="pickupOption$ | async"
     [displayPickupLocation]="displayPickupLocation$ | async"
     (pickupOptionChange)="onPickupOptionChange($event)"
-    (pickupLocationChange)="openDialog()"
+    (pickupLocationChange)="openDialog($event)"
   ></cx-pickup-options>
 </ng-container>
diff --git a/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.spec.ts b/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.spec.ts
index bcdf9eb1290..5dc87103d57 100644
--- a/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.spec.ts
+++ b/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.spec.ts
@@ -2,7 +2,11 @@ import { CommonModule } from '@angular/common';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { I18nTestingModule, Product } from '@spartacus/core';
+import {
+  FeatureConfigService,
+  I18nTestingModule,
+  Product,
+} from '@spartacus/core';
 
 import {
   AugmentedPointOfService,
@@ -13,8 +17,8 @@ import {
 } from '@spartacus/pickup-in-store/root';
 import {
   CurrentProductService,
-  LaunchDialogService,
   LAUNCH_CALLER,
+  LaunchDialogService,
 } from '@spartacus/storefront';
 import { Observable, of, Subscription } from 'rxjs';
 import { PdpPickupOptionsContainerComponent } from './pdp-pickup-options-container.component';
@@ -80,6 +84,12 @@ class MockCurrentLocationService {
   }
 }
 
+class MockFeatureConfigService {
+  isEnabled() {
+    return true;
+  }
+}
+
 describe('PdpPickupOptionsComponent', () => {
   let component: PdpPickupOptionsContainerComponent;
   let fixture: ComponentFixture<PdpPickupOptionsContainerComponent>;
@@ -118,6 +128,10 @@ describe('PdpPickupOptionsComponent', () => {
           provide: CurrentLocationService,
           useClass: MockCurrentLocationService,
         },
+        {
+          provide: FeatureConfigService,
+          useClass: MockFeatureConfigService,
+        },
       ],
     });
 
diff --git a/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.ts b/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.ts
index 8a132982801..9521bb3af46 100644
--- a/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.ts
+++ b/feature-libs/pickup-in-store/components/container/pdp-pickup-options-container/pdp-pickup-options-container.component.ts
@@ -7,12 +7,13 @@
 import {
   Component,
   ElementRef,
+  inject,
   OnDestroy,
   OnInit,
   ViewChild,
   ViewContainerRef,
 } from '@angular/core';
-import { Product } from '@spartacus/core';
+import { FeatureConfigService, Product } from '@spartacus/core';
 
 import {
   AugmentedPointOfService,
@@ -26,8 +27,8 @@ import {
 } from '@spartacus/pickup-in-store/root';
 import {
   CurrentProductService,
-  LaunchDialogService,
   LAUNCH_CALLER,
+  LaunchDialogService,
 } from '@spartacus/storefront';
 import { combineLatest, iif, Observable, of, Subscription } from 'rxjs';
 import {
@@ -55,6 +56,12 @@ function isProductWithCode(
   templateUrl: 'pdp-pickup-options-container.component.html',
 })
 export class PdpPickupOptionsContainerComponent implements OnInit, OnDestroy {
+  // TODO: Remove element reference once 'a11yDialogTriggerRefocus' feature flag is removed.
+  /**
+   * @deprecated since 2211.28.0
+   * This reference does not point to any element and will be removed at earliest convinience.
+   * The 'triggerElement' is passed through 'PickupOptionChange' event instead.
+   */
   @ViewChild('open') element: ElementRef;
   subscription = new Subscription();
 
@@ -65,6 +72,7 @@ export class PdpPickupOptionsContainerComponent implements OnInit, OnDestroy {
   private productCode: string;
   private displayNameIsSet = false;
 
+  private featureConfigService = inject(FeatureConfigService);
   constructor(
     protected currentProductService: CurrentProductService,
     protected intendedPickupLocationService: IntendedPickupLocationFacade,
@@ -160,10 +168,17 @@ export class PdpPickupOptionsContainerComponent implements OnInit, OnDestroy {
     this.subscription.unsubscribe();
   }
 
-  openDialog(): void {
+  // TODO: Make argument required once 'a11yDialogTriggerRefocus' feature flag is removed.
+  /**
+   * @deprecated since 2211.28.0 - The use of TriggerElement param will become mandatory.
+   * @param triggerElement - The reference of element that triggered the dialog. Used to refocus on it after the dialog is closed.
+   */
+  openDialog(triggerElement?: ElementRef): void {
     const dialog = this.launchDialogService.openDialog(
       LAUNCH_CALLER.PICKUP_IN_STORE,
-      this.element,
+      this.featureConfigService.isEnabled('a11yDialogTriggerRefocus')
+        ? triggerElement
+        : this.element,
       this.vcr,
       { productCode: this.productCode }
     );
@@ -173,16 +188,46 @@ export class PdpPickupOptionsContainerComponent implements OnInit, OnDestroy {
     }
   }
 
-  onPickupOptionChange(option: PickupOption) {
-    this.intendedPickupLocationService.setPickupOption(
-      this.productCode,
-      option
-    );
-    if (option === 'delivery') {
-      return;
-    }
-    if (!this.displayNameIsSet) {
-      this.openDialog();
+  // TODO: Remove 'PickupOption' argument type once 'a11yDialogTriggerRefocus' feature flag is removed.
+  /**
+   * @deprecated since 2211.28.0 - Use event param instead of option.
+   * @param event - Object containing the selected option and the element that triggered the change.
+   */
+  onPickupOptionChange(option: PickupOption): void;
+  // eslint-disable-next-line @typescript-eslint/unified-signatures
+  onPickupOptionChange(event: {
+    option: PickupOption;
+    triggerElement: ElementRef;
+  }): void;
+  onPickupOptionChange(
+    event: { option: PickupOption; triggerElement: ElementRef } | PickupOption
+  ): void {
+    if (
+      this.featureConfigService.isEnabled('a11yDialogTriggerRefocus') &&
+      typeof event === 'object'
+    ) {
+      const { option, triggerElement = undefined } = event;
+      this.intendedPickupLocationService.setPickupOption(
+        this.productCode,
+        option
+      );
+      if (option === 'delivery') {
+        return;
+      }
+      if (!this.displayNameIsSet) {
+        this.openDialog(triggerElement);
+      }
+    } else if (typeof event === 'string') {
+      this.intendedPickupLocationService.setPickupOption(
+        this.productCode,
+        event
+      );
+      if (event === 'delivery') {
+        return;
+      }
+      if (!this.displayNameIsSet) {
+        this.openDialog();
+      }
     }
   }
 }
diff --git a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html
index 6d39b19c23c..2c2b3da2cfa 100644
--- a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html
+++ b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.html
@@ -43,6 +43,7 @@
           |
           <button
             *cxFeature="'a11yUseButtonsForBtnLinks'"
+            #dialogTriggerEl
             [attr.data-store-location-link]="
               displayPickupLocation ? 'change' : 'select'
             "
@@ -59,6 +60,7 @@
           <a
             *cxFeature="'!a11yUseButtonsForBtnLinks'"
             role="button"
+            #dialogTriggerEl
             [attr.data-store-location-link]="
               displayPickupLocation ? 'change' : 'select'
             "
@@ -119,6 +121,7 @@
           |
           <button
             *cxFeature="'a11yUseButtonsForBtnLinks'"
+            #dialogTriggerEl
             [attr.data-store-location-link]="
               displayPickupLocation ? 'change' : 'select'
             "
@@ -134,6 +137,7 @@
           </button>
           <a
             *cxFeature="'!a11yUseButtonsForBtnLinks'"
+            #dialogTriggerEl
             role="button"
             [attr.data-store-location-link]="
               displayPickupLocation ? 'change' : 'select'
diff --git a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.spec.ts b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.spec.ts
index d6844809964..f0c52beea08 100644
--- a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.spec.ts
+++ b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.spec.ts
@@ -2,12 +2,18 @@ import { CommonModule } from '@angular/common';
 import { Component, Input } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
-import { I18nTestingModule } from '@spartacus/core';
+import { FeatureConfigService, I18nTestingModule } from '@spartacus/core';
 import { PickupOption } from '@spartacus/pickup-in-store/root';
 import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive';
 import { Observable } from 'rxjs';
 import { PickupOptionsComponent } from './pickup-options.component';
 
+class MockFeatureConfigService {
+  isEnabled() {
+    return true;
+  }
+}
+
 describe('PickupOptionsComponent', () => {
   let component: PickupOptionsComponent;
   let fixture: ComponentFixture<PickupOptionsComponent>;
@@ -16,6 +22,9 @@ describe('PickupOptionsComponent', () => {
     TestBed.configureTestingModule({
       declarations: [PickupOptionsComponent, MockFeatureDirective],
       imports: [CommonModule, I18nTestingModule, ReactiveFormsModule],
+      providers: [
+        { provide: FeatureConfigService, useClass: MockFeatureConfigService },
+      ],
     });
     fixture = TestBed.createComponent(PickupOptionsComponent);
     component = fixture.componentInstance;
@@ -43,7 +52,10 @@ describe('PickupOptionsComponent', () => {
     spyOn(component.pickupOptionChange, 'emit');
     component.onPickupOptionChange('delivery');
 
-    expect(component.pickupOptionChange.emit).toHaveBeenCalledWith('delivery');
+    expect(component.pickupOptionChange.emit).toHaveBeenCalledWith({
+      option: 'delivery',
+      triggerElement: component.triggerElement,
+    });
   });
 
   it('should emit on onPickupLocationChange', () => {
diff --git a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.ts b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.ts
index 7cb40e0cf54..a3a310639c3 100644
--- a/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.ts
+++ b/feature-libs/pickup-in-store/components/presentational/pickup-options/pickup-options.component.ts
@@ -6,13 +6,16 @@
 
 import {
   Component,
+  ElementRef,
   EventEmitter,
+  inject,
   Input,
   OnChanges,
   Output,
+  ViewChild,
 } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { useFeatureStyles } from '@spartacus/core';
+import { FeatureConfigService, useFeatureStyles } from '@spartacus/core';
 import { PickupOption } from '@spartacus/pickup-in-store/root';
 
 /**
@@ -32,9 +35,18 @@ export class PickupOptionsComponent implements OnChanges {
   @Input() disableControls = false;
 
   /** Emitted when the selected option is changed. */
-  @Output() pickupOptionChange = new EventEmitter<PickupOption>();
+  // TODO: Remove the 'PickupOption' type when the `a11yDialogTriggerRefocus` feature flag is removed.
+  @Output() pickupOptionChange = new EventEmitter<
+    { option: PickupOption; triggerElement: ElementRef } | PickupOption
+  >();
+
   /** Emitted when a new store should be selected. */
-  @Output() pickupLocationChange = new EventEmitter<undefined>();
+  // TODO: Remove the undefined type when the `a11yDialogTriggerRefocus` feature flag is removed.
+  @Output() pickupLocationChange = new EventEmitter<ElementRef | undefined>();
+
+  @ViewChild('dialogTriggerEl') triggerElement: ElementRef;
+
+  private featureConfigService = inject(FeatureConfigService);
 
   pickupId = `pickup-id:${Math.random().toString(16)}`;
   deliveryId = `delivery-id:${Math.random().toString(16)}`;
@@ -57,12 +69,23 @@ export class PickupOptionsComponent implements OnChanges {
 
   /** Emit a new selected option. */
   onPickupOptionChange(option: PickupOption): void {
-    this.pickupOptionChange.emit(option);
+    if (this.featureConfigService.isEnabled('a11yDialogTriggerRefocus')) {
+      this.pickupOptionChange.emit({
+        option,
+        triggerElement: this.triggerElement,
+      });
+    } else {
+      this.pickupOptionChange.emit(option);
+    }
   }
 
   /** Emit to indicate a new store should be selected. */
   onPickupLocationChange(): boolean {
-    this.pickupLocationChange.emit();
+    if (this.featureConfigService.isEnabled('a11yDialogTriggerRefocus')) {
+      this.pickupLocationChange.emit(this.triggerElement);
+    } else {
+      this.pickupLocationChange.emit();
+    }
     // Return false to stop `onPickupOptionChange` being called after this
     return false;
   }
diff --git a/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts b/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts
index 3d426a5aaba..cc5b9ce9f99 100644
--- a/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts
+++ b/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts
@@ -549,6 +549,12 @@ export interface FeatureTogglesInterface {
    */
   a11yDialogsHeading?: boolean;
 
+  /**
+   * When enabled, the focus will be returned to the trigger element after the dialog is closed.
+   * Affected components: 'AddtoCartComponent', 'PickupOptionsComponent'
+   */
+  a11yDialogTriggerRefocus?: boolean;
+
   /**
    * The 'AddToWishListComponent' will restore focus to the button after adding or removing an item from the wishlist.
    */
@@ -696,6 +702,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   a11yQuickOrderAriaControls: false,
   a11yRemoveStatusLoadedRole: false,
   a11yDialogsHeading: false,
+  a11yDialogTriggerRefocus: false,
   a11yAddToWishlistFocus: false,
   a11ySearchBoxFocusOnEscape: false,
   occCartNameAndDescriptionInHttpRequestBody: false,
diff --git a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/focus-management.e2e.cy.ts b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/focus-management.e2e.cy.ts
index f89206d5997..3dea1a4b423 100644
--- a/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/focus-management.e2e.cy.ts
+++ b/projects/storefrontapp-e2e-cypress/cypress/e2e/accessibility/focus-management.e2e.cy.ts
@@ -23,4 +23,22 @@ describe('Focus managment for a11y', () => {
       });
     });
   });
+
+  context('Add to cart modal', () => {
+    it('Should re-focus the element triggering the modal after it closes', () => {
+      cy.visit(`/product/266685`);
+      cy.contains('Add to cart').click();
+      cy.get('[aria-label="Close Modal"]').click();
+      cy.contains('Add to cart').should('have.focus');
+    });
+  });
+
+  context('Pick up in store modal', () => {
+    it('Should re-focus the element triggering the modal after it closes', () => {
+      cy.visit(`/product/266685`);
+      cy.contains('Select Store').click();
+      cy.get('[aria-label="Close"]').click();
+      cy.contains('Select Store').should('have.focus');
+    });
+  });
 });
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
index 7d27fb6e224..c983448d32a 100644
--- a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
+++ b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
@@ -371,6 +371,7 @@ if (environment.cpq) {
         a11yQuickOrderAriaControls: true,
         a11yRemoveStatusLoadedRole: true,
         a11yDialogsHeading: true,
+        a11yDialogTriggerRefocus: true,
         a11yAddToWishlistFocus: true,
         a11ySearchBoxFocusOnEscape: true,
         cmsBottomHeaderSlotUsingFlexStyles: true,

From 88f03c16e974f6e525e1143544cb9206c1597f10 Mon Sep 17 00:00:00 2001
From: Roman <129765378+rmch91@users.noreply.github.com>
Date: Fri, 4 Oct 2024 15:08:11 +0200
Subject: [PATCH 2/5] Release 2211.29.0 (#19338)

---
 core-libs/setup/package.json                  |  10 +-
 feature-libs/asm/package.json                 |  18 +-
 feature-libs/cart/package.json                |  12 +-
 feature-libs/checkout/package.json            |  16 +-
 feature-libs/customer-ticketing/package.json  |  12 +-
 .../estimated-delivery-date/package.json      |  14 +-
 feature-libs/order/package.json               |  16 +-
 feature-libs/organization/package.json        |  16 +-
 feature-libs/pdf-invoices/package.json        |  10 +-
 feature-libs/pickup-in-store/package.json     |  18 +-
 .../product-configurator/package.json         |  16 +-
 .../product-multi-dimensional/package.json    |  10 +-
 feature-libs/product/package.json             |  10 +-
 feature-libs/qualtrics/package.json           |   8 +-
 feature-libs/quote/package.json               |  12 +-
 .../requested-delivery-date/package.json      |  16 +-
 feature-libs/smartedit/package.json           |   6 +-
 feature-libs/storefinder/package.json         |  10 +-
 feature-libs/tracking/package.json            |   6 +-
 feature-libs/user/package.json                |  10 +-
 integration-libs/cdc/package.json             |  14 +-
 integration-libs/cdp/package.json             |   6 +-
 integration-libs/cds/package.json             |  14 +-
 integration-libs/cpq-quote/package.json       |  10 +-
 .../digital-payments/package.json             |  12 +-
 .../epd-visualization/package.json            |  12 +-
 integration-libs/omf/package.json             |   8 +-
 integration-libs/opps/package.json            |   8 +-
 integration-libs/s4-service/package.json      |  14 +-
 integration-libs/s4om/package.json            |  16 +-
 integration-libs/segment-refs/package.json    |   6 +-
 projects/assets/package.json                  |   2 +-
 projects/core/package.json                    |   2 +-
 projects/schematics/package.json              |   2 +-
 projects/schematics/src/dependencies.json     | 308 +++++++++---------
 .../ng-add/__snapshots__/index_spec.ts.snap   |  10 +-
 projects/ssr-tests/package.json               |   4 +-
 projects/storefrontlib/package.json           |   4 +-
 projects/storefrontstyles/package.json        |   2 +-
 tools/config/const.ts                         |   2 +-
 40 files changed, 351 insertions(+), 351 deletions(-)

diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
index c94f2015a4d..de48148ca93 100644
--- a/core-libs/setup/package.json
+++ b/core-libs/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/setup",
-  "version": "2211.29.0-2",
+  "version": "2211.29.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.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2"
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/user": "2211.29.0"
   },
   "optionalDependencies": {
     "@angular/platform-server": "^17.0.5",
diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
index 9ef394d43e1..605268eff92 100644
--- a/feature-libs/asm/package.json
+++ b/feature-libs/asm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/asm",
-  "version": "2211.29.0-2",
+  "version": "2211.29.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.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefinder": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefinder": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
index d98cde125b0..8e5caa530c0 100644
--- a/feature-libs/cart/package.json
+++ b/feature-libs/cart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cart",
-  "version": "2211.29.0-2",
+  "version": "2211.29.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.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
index 7b306b2bc34..01d6895b6f4 100644
--- a/feature-libs/checkout/package.json
+++ b/feature-libs/checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/checkout",
-  "version": "2211.29.0-2",
+  "version": "2211.29.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.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json
index 94e52d84e85..4acd04b0509 100644
--- 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.0-2",
+  "version": "2211.29.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.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/estimated-delivery-date/package.json b/feature-libs/estimated-delivery-date/package.json
index 0356b20e0bb..e919c30b847 100644
--- 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.0-2",
+  "version": "2211.29.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.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/order/package.json b/feature-libs/order/package.json
index 90cad42200a..945f2a3defa 100644
--- a/feature-libs/order/package.json
+++ b/feature-libs/order/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/order",
-  "version": "2211.29.0-2",
+  "version": "2211.29.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.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/pdf-invoices": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/pdf-invoices": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/organization/package.json b/feature-libs/organization/package.json
index 8742b6954da..f2cccd5641a 100644
--- a/feature-libs/organization/package.json
+++ b/feature-libs/organization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/organization",
-  "version": "2211.29.0-2",
+  "version": "2211.29.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.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/pdf-invoices/package.json b/feature-libs/pdf-invoices/package.json
index 9548b005124..ba47f3dd487 100644
--- 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.0-2",
+  "version": "2211.29.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.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/pickup-in-store/package.json b/feature-libs/pickup-in-store/package.json
index af99e1a817d..59da5814b13 100644
--- 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.0-2",
+  "version": "2211.29.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.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefinder": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefinder": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/product-configurator/package.json b/feature-libs/product-configurator/package.json
index 0df4374764e..0d38d0e9a38 100644
--- a/feature-libs/product-configurator/package.json
+++ b/feature-libs/product-configurator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/product-configurator",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Product configurator 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.0-2",
-    "@spartacus/checkout": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/checkout": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/product-multi-dimensional/package.json b/feature-libs/product-multi-dimensional/package.json
index 1e4abaa8344..259a73d89ba 100644
--- a/feature-libs/product-multi-dimensional/package.json
+++ b/feature-libs/product-multi-dimensional/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/product-multi-dimensional",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Product Multi-Dimensional library for Spartacus",
   "keywords": [
     "spartacus",
@@ -31,10 +31,10 @@
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/product/package.json b/feature-libs/product/package.json
index 3ca5c5b5f76..368e16cdfcb 100644
--- a/feature-libs/product/package.json
+++ b/feature-libs/product/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/product",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Product library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,10 +29,10 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/qualtrics/package.json b/feature-libs/qualtrics/package.json
index 47fc7ef5c50..29824ad93b4 100644
--- a/feature-libs/qualtrics/package.json
+++ b/feature-libs/qualtrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/qualtrics",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Qualtrics library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,9 +30,9 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/quote/package.json b/feature-libs/quote/package.json
index 69d8019957e..4977955d6c9 100644
--- a/feature-libs/quote/package.json
+++ b/feature-libs/quote/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/quote",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "",
   "keywords": [
     "spartacus",
@@ -32,11 +32,11 @@
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/requested-delivery-date/package.json b/feature-libs/requested-delivery-date/package.json
index c1d58930b51..650dd95c562 100644
--- a/feature-libs/requested-delivery-date/package.json
+++ b/feature-libs/requested-delivery-date/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/requested-delivery-date",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Requested Delivery Date library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,13 +29,13 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/checkout": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/checkout": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/smartedit/package.json b/feature-libs/smartedit/package.json
index 0b945b4e510..9c1c3fd7962 100644
--- a/feature-libs/smartedit/package.json
+++ b/feature-libs/smartedit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/smartedit",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Smart Edit feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -23,8 +23,8 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/storefinder/package.json b/feature-libs/storefinder/package.json
index d1f93014720..63d716548f2 100644
--- a/feature-libs/storefinder/package.json
+++ b/feature-libs/storefinder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/storefinder",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Store finder feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,10 +32,10 @@
     "@angular/router": "^17.0.5",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/feature-libs/tracking/package.json b/feature-libs/tracking/package.json
index 436e9afbca1..e69a9742256 100644
--- a/feature-libs/tracking/package.json
+++ b/feature-libs/tracking/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/tracking",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Spartacus tracking and personalization library",
   "keywords": [
     "spartacus",
@@ -27,8 +27,8 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/feature-libs/user/package.json b/feature-libs/user/package.json
index be808df76cd..476e93b9030 100644
--- a/feature-libs/user/package.json
+++ b/feature-libs/user/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/user",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "User feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -32,10 +32,10 @@
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cdc/package.json b/integration-libs/cdc/package.json
index b4d22ae19d7..02e5319b625 100644
--- a/integration-libs/cdc/package.json
+++ b/integration-libs/cdc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cdc",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Customer Data Cloud Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,12 +30,12 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/asm": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/organization": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/asm": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/organization": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cdp/package.json b/integration-libs/cdp/package.json
index 217bcbad407..5803769c7ad 100644
--- a/integration-libs/cdp/package.json
+++ b/integration-libs/cdp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cdp",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Customer Data Platform Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -24,8 +24,8 @@
   "peerDependencies": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/customer-ticketing": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
+    "@spartacus/customer-ticketing": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cds/package.json b/integration-libs/cds/package.json
index f31ae87f971..9c665e5fd8b 100644
--- a/integration-libs/cds/package.json
+++ b/integration-libs/cds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cds",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Context Driven Service library for Spartacus",
   "keywords": [
     "spartacus",
@@ -28,12 +28,12 @@
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/tracking": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/tracking": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/cpq-quote/package.json b/integration-libs/cpq-quote/package.json
index cce917b8ec5..2b9ff57201e 100644
--- a/integration-libs/cpq-quote/package.json
+++ b/integration-libs/cpq-quote/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cpq-quote",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "cpq-quote library for Spartacus",
   "keywords": [
     "spartacus",
@@ -23,10 +23,10 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/digital-payments/package.json b/integration-libs/digital-payments/package.json
index f9db458ecd7..d9f255949a7 100644
--- a/integration-libs/digital-payments/package.json
+++ b/integration-libs/digital-payments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/digital-payments",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Digital Payments Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -27,11 +27,11 @@
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/checkout": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/checkout": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/epd-visualization/package.json b/integration-libs/epd-visualization/package.json
index b7a8c7952a3..025ee26a24c 100644
--- a/integration-libs/epd-visualization/package.json
+++ b/integration-libs/epd-visualization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/epd-visualization",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "SAP Enterprise Product Development Visualization integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -38,11 +38,11 @@
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@sapui5/ts-types-esm": "1.120.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
diff --git a/integration-libs/omf/package.json b/integration-libs/omf/package.json
index 67f648138b3..8ad6a609d64 100644
--- a/integration-libs/omf/package.json
+++ b/integration-libs/omf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/omf",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "SAP Order Management Foundation Integration",
   "keywords": [
     "spartacus",
@@ -25,9 +25,9 @@
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/opps/package.json b/integration-libs/opps/package.json
index ba923acf436..8987bc5b570 100644
--- a/integration-libs/opps/package.json
+++ b/integration-libs/opps/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/opps",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "OPPS (Omni-Channel Personalization and Promotions Services) library for Spartacus",
   "keywords": [
     "spartacus",
@@ -29,9 +29,9 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/s4-service/package.json b/integration-libs/s4-service/package.json
index 46f91f44986..381838a54b1 100644
--- a/integration-libs/s4-service/package.json
+++ b/integration-libs/s4-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/s4-service",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "S/4HANA Service Integration Integration library for Spartacus",
   "keywords": [
     "spartacus",
@@ -30,12 +30,12 @@
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/checkout": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/checkout": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/s4om/package.json b/integration-libs/s4om/package.json
index 2d20011796d..92b5ad2a15d 100644
--- a/integration-libs/s4om/package.json
+++ b/integration-libs/s4om/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/s4om",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "S/4HANA Order Management (b2b feature)",
   "keywords": [
     "spartacus",
@@ -23,13 +23,13 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/pdf-invoices": "2211.29.0-2",
-    "@spartacus/requested-delivery-date": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/pdf-invoices": "2211.29.0",
+    "@spartacus/requested-delivery-date": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/integration-libs/segment-refs/package.json b/integration-libs/segment-refs/package.json
index 0c21c64a102..40a0e061878 100644
--- a/integration-libs/segment-refs/package.json
+++ b/integration-libs/segment-refs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/segment-refs",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "segment-refs",
   "keywords": [
     "spartacus",
@@ -23,8 +23,8 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {
diff --git a/projects/assets/package.json b/projects/assets/package.json
index 90949d7deea..f8c128303a7 100644
--- a/projects/assets/package.json
+++ b/projects/assets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/assets",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "homepage": "https://github.com/SAP/spartacus",
   "repository": "https://github.com/SAP/spartacus/tree/develop/projects/assets",
   "scripts": {
diff --git a/projects/core/package.json b/projects/core/package.json
index f41fa7a18b8..f0df8903de1 100644
--- a/projects/core/package.json
+++ b/projects/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/core",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Spartacus - the core framework",
   "keywords": [
     "spartacus",
diff --git a/projects/schematics/package.json b/projects/schematics/package.json
index 2c5e1750de0..c77743c60dd 100644
--- a/projects/schematics/package.json
+++ b/projects/schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/schematics",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Spartacus schematics",
   "keywords": [
     "spartacus",
diff --git a/projects/schematics/src/dependencies.json b/projects/schematics/src/dependencies.json
index ff4286ae720..b32c659abd4 100644
--- a/projects/schematics/src/dependencies.json
+++ b/projects/schematics/src/dependencies.json
@@ -24,7 +24,7 @@
     "typescript": "^5.2.2"
   },
   "ssr-tests": {
-    "@spartacus/core": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
     "http-proxy": "^1.18.1",
     "jest-circus": "^29.0.0",
     "jest-environment-node": "^29.0.0"
@@ -41,7 +41,7 @@
     "@ngrx/effects": "^17.0.1",
     "@ngrx/router-store": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
     "ngx-infinite-scroll": "^17.0.0",
     "rxjs": "^7.8.0"
   },
@@ -54,10 +54,10 @@
   "@spartacus/setup": {
     "@angular/core": "^17.0.5",
     "@angular/ssr": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2"
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/user": "2211.29.0"
   },
   "@spartacus/asm": {
     "@angular-devkit/schematics": "^17.0.5",
@@ -67,14 +67,14 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefinder": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefinder": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cart": {
@@ -86,11 +86,11 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -102,13 +102,13 @@
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -118,23 +118,23 @@
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/estimated-delivery-date": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/order": {
@@ -146,13 +146,13 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/pdf-invoices": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/pdf-invoices": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/organization": {
@@ -164,13 +164,13 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -179,10 +179,10 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/pickup-in-store": {
@@ -193,14 +193,14 @@
     "@angular/router": "^17.0.5",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefinder": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefinder": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -209,10 +209,10 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -225,13 +225,13 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/checkout": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/checkout": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/product-multi-dimensional": {
@@ -241,10 +241,10 @@
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -252,9 +252,9 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -264,11 +264,11 @@
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -277,21 +277,21 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/checkout": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/checkout": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/smartedit": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/storefinder": {
@@ -302,10 +302,10 @@
     "@angular/router": "^17.0.5",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -313,8 +313,8 @@
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/user": {
@@ -325,10 +325,10 @@
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cdc": {
@@ -340,19 +340,19 @@
     "@ng-select/ng-select": "^12.0.4",
     "@ngrx/effects": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/asm": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/organization": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/user": "2211.29.0-2",
+    "@spartacus/asm": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/organization": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/user": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cdp": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/customer-ticketing": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
+    "@spartacus/customer-ticketing": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cds": {
@@ -361,22 +361,22 @@
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/tracking": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/tracking": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/cpq-quote": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/digital-payments": {
@@ -386,11 +386,11 @@
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ng-select/ng-select": "^12.0.4",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/checkout": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/checkout": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/epd-visualization": {
@@ -400,11 +400,11 @@
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@sapui5/ts-types-esm": "1.120.1",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },
@@ -414,9 +414,9 @@
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/opps": {
@@ -424,9 +424,9 @@
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/s4-service": {
@@ -435,33 +435,33 @@
     "@angular/core": "^17.0.5",
     "@angular/forms": "^17.0.5",
     "@angular/router": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/checkout": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/order": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/checkout": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/order": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/s4om": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/cart": "2211.29.0-2",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/pdf-invoices": "2211.29.0-2",
-    "@spartacus/requested-delivery-date": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
-    "@spartacus/storefront": "2211.29.0-2",
-    "@spartacus/styles": "2211.29.0-2",
+    "@spartacus/cart": "2211.29.0",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/pdf-invoices": "2211.29.0",
+    "@spartacus/requested-delivery-date": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
+    "@spartacus/storefront": "2211.29.0",
+    "@spartacus/styles": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "@spartacus/segment-refs": {
     "@angular-devkit/schematics": "^17.0.5",
     "@angular/common": "^17.0.5",
     "@angular/core": "^17.0.5",
-    "@spartacus/core": "2211.29.0-2",
-    "@spartacus/schematics": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
+    "@spartacus/schematics": "2211.29.0",
     "rxjs": "^7.8.0"
   },
   "storefrontapp": {
diff --git a/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap b/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
index 6405876ebec..a5167f3c21a 100644
--- a/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
+++ b/projects/schematics/src/ng-add/__snapshots__/index_spec.ts.snap
@@ -61,11 +61,11 @@ exports[`Spartacus Schematics: ng-add should add spartacus properly with SSR 2`]
     "@ngrx/effects": "^17.0.1",
     "@ngrx/router-store": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/assets": "~2211.29.0-2",
-    "@spartacus/core": "~2211.29.0-2",
-    "@spartacus/setup": "~2211.29.0-2",
-    "@spartacus/storefront": "~2211.29.0-2",
-    "@spartacus/styles": "~2211.29.0-2",
+    "@spartacus/assets": "~2211.29.0",
+    "@spartacus/core": "~2211.29.0",
+    "@spartacus/setup": "~2211.29.0",
+    "@spartacus/storefront": "~2211.29.0",
+    "@spartacus/styles": "~2211.29.0",
     "angular-oauth2-oidc": "^17.0.1",
     "bootstrap": "^4.6.2",
     "express": "^4.18.2",
diff --git a/projects/ssr-tests/package.json b/projects/ssr-tests/package.json
index d44b5aa712c..f075dbed63b 100644
--- a/projects/ssr-tests/package.json
+++ b/projects/ssr-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ssr-tests",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "private": true,
   "description": "Spartacus SSR Tests",
   "keywords": [
@@ -17,7 +17,7 @@
     "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@spartacus/core": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
     "http-proxy": "^1.18.1",
     "jest-circus": "^29.0.0",
     "jest-environment-node": "^29.0.0"
diff --git a/projects/storefrontlib/package.json b/projects/storefrontlib/package.json
index 7c2bbf7e382..45042df6861 100644
--- a/projects/storefrontlib/package.json
+++ b/projects/storefrontlib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/storefront",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "keywords": [
     "spartacus",
     "storefront",
@@ -23,7 +23,7 @@
     "@ngrx/effects": "^17.0.1",
     "@ngrx/router-store": "^17.0.1",
     "@ngrx/store": "^17.0.1",
-    "@spartacus/core": "2211.29.0-2",
+    "@spartacus/core": "2211.29.0",
     "ngx-infinite-scroll": "^17.0.0",
     "rxjs": "^7.8.0"
   },
diff --git a/projects/storefrontstyles/package.json b/projects/storefrontstyles/package.json
index c1a729b0185..98bbcf85525 100644
--- a/projects/storefrontstyles/package.json
+++ b/projects/storefrontstyles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/styles",
-  "version": "2211.29.0-2",
+  "version": "2211.29.0",
   "description": "Style library containing global styles",
   "keywords": [
     "spartacus",
diff --git a/tools/config/const.ts b/tools/config/const.ts
index 409de4f9be2..840a2796a8f 100644
--- a/tools/config/const.ts
+++ b/tools/config/const.ts
@@ -10,4 +10,4 @@ export const SPARTACUS_SCOPE = '@spartacus';
 export const SAP_SCOPE = 'sap';
 export const SAPUI5_TYPES = '@sapui5/ts-types-esm';
 export const SPARTACUS_SCHEMATICS = `${SPARTACUS_SCOPE}/schematics`;
-export const PUBLISHING_VERSION = '2211.29.0-2';
+export const PUBLISHING_VERSION = '2211.29.0';

From a6f91eb393dd443d3cd7f231c50e7c0deafc8cc7 Mon Sep 17 00:00:00 2001
From: Krzysztof Platis <platonn.git@gmail.com>
Date: Fri, 4 Oct 2024 16:37:16 +0200
Subject: [PATCH 3/5] test(SSR e2e): re-enable test "should receive response
 with status 500 if HTTP error occurred when calling other than cms/pages API
 URL" (#19331)

Note: the change of the intercepted API URL `cms/pages` to `cms/components` is not the fix of the flakiness.
It's simply reverting an accidental change  that was made in the very recent PR - see https://github.com/SAP/spartacus/pull/19307/files?w=1#diff-799b5da094cfd6cc4192ea13d66afac3f264e0502fe21893c3c4e04f024fae45R73 (change from `cms/components` to `cms/pages`). This accidental change wasn't spotted before, because this test used to be skipped.

Now we're un-skipping it.

The flakiness could have been fix by the PR https://github.com/SAP/spartacus/pull/19307/, which introduced a new way of intercepting requests - `responseInterceptor` (instead of the old `callback`).

I've re-run this test 20+ times on local and it passes.

closes https://jira.tools.sap/browse/CXSPA-8570
---
 projects/ssr-tests/src/ssr-testing.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/ssr-tests/src/ssr-testing.spec.ts b/projects/ssr-tests/src/ssr-testing.spec.ts
index b891d6bc25c..3f696fedc02 100644
--- a/projects/ssr-tests/src/ssr-testing.spec.ts
+++ b/projects/ssr-tests/src/ssr-testing.spec.ts
@@ -66,11 +66,11 @@ describe('SSR E2E', () => {
           expect(response.statusCode).toEqual(404);
         });
 
-        it.skip('should receive response with status 500 if HTTP error occurred when calling other than cms/pages API URL', async () => {
+        it('should receive response with status 500 if HTTP error occurred when calling other than cms/pages API URL', async () => {
           backendProxy = await ProxyUtils.startBackendProxyServer({
             target: BACKEND_BASE_URL,
             responseInterceptor: ({ res, req, body }) => {
-              if (req.url?.includes('cms/pages')) {
+              if (req.url?.includes('cms/components')) {
                 res.statusCode = 404;
               }
               res.end(body);

From 81c7302ba0da80a2e5feb3423281d60454998a72 Mon Sep 17 00:00:00 2001
From: Krzysztof Platis <platonn.git@gmail.com>
Date: Fri, 4 Oct 2024 17:36:44 +0200
Subject: [PATCH 4/5] test(SSR e2e): Validate SSR app under test is built in
 prod mode and using a proxy backend, before running tests (#19334)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:
To run SSR Tests, it's necessary to execute: `npm run build` and `npm run build:ssr:local-http-backend` - in order to have an app built in prod mode and using a proxy backend. This step can be easily overlooked by newcomers.
Otherwise, some tests might fail:
- some tests asserting JSON SSR messages might fail - if app built in dev mode which prints JSON logs in multi-line (instead of single-line)
- some tests mocking the backend might fail - if app is not configured to call a Proxy Backend

Previously, we were checking only if the app is built in prod mode. And we were checking it by symptoms in tests runtime, with the following heuristic: if there's any log line starting with character `{` but not possible to parse as a JSON, then it's probably running in dev mode. In such case were throwing an error.

Now, were checking both if the app is in prod mode and if it's using a backend proxy server. We check it statically before running the tests, with the following heuristics:
- if the build output file `dist/storefrontapp-server/main.js` contains a marker string `CX_BASE_URL:"http://localhost:9002"`, then we know the app is using a local proxy backend
- if the build output file `dist/storefrontapp-server/main.js` contains a marker string `ngDevMode`, then we know the app is build in dev mode

**QA steps:**
**Scenario 1 ❌ - missing `main.js`:**
- remove `dist/storefrontapp-server/main.js`
- run `npm run test:ssr`
- verify the following error message appears before running tests:
   ![image](https://github.com/user-attachments/assets/93a23543-6a26-4922-b478-9363750046ab)

**Scenario 2 ❌ - dev-mode build:**
- run `npm run dev:ssr` and wait until it fully compiles and then kill the process
- run `npm run test:ssr`
- verify the following error message appears before running tests:
   ![image](https://github.com/user-attachments/assets/48eaae99-16a0-46a0-b5df-131541fa11c1)

**Scenario 3 ❌ - prod-mode build BUT not using local http proxy backend:**
- run `npm run build && npm run build:ssr`
- run `npm run test:ssr`
- verify the following error message appears before running tests:
   ![image](https://github.com/user-attachments/assets/28cae1ab-07e5-42ff-9edb-4448b8326cef)

**Scenario 4 ✅ - prod-mode build AND  using local http proxy backend:**
- run `npm run build && npm run build:ssr`
- run `npm run test:ssr`
- verify the tests run successfully:
   ![image](https://github.com/user-attachments/assets/14dbf112-c9c1-4aac-9f82-ca5dbf31600e)

closes https://jira.tools.sap/browse/CXSPA-8586
---
 projects/ssr-tests/jest.config.js         |  1 +
 projects/ssr-tests/src/utils/log.utils.ts | 27 --------
 projects/ssr-tests/validate-ssr-build.ts  | 84 +++++++++++++++++++++++
 3 files changed, 85 insertions(+), 27 deletions(-)
 create mode 100644 projects/ssr-tests/validate-ssr-build.ts

diff --git a/projects/ssr-tests/jest.config.js b/projects/ssr-tests/jest.config.js
index f0aea45398b..9216d61df84 100644
--- a/projects/ssr-tests/jest.config.js
+++ b/projects/ssr-tests/jest.config.js
@@ -23,4 +23,5 @@ module.exports = {
     },
   },
   testEnvironment: './src/environments/custom-test-environment.ts',
+  globalSetup: './validate-ssr-build.ts',
 };
diff --git a/projects/ssr-tests/src/utils/log.utils.ts b/projects/ssr-tests/src/utils/log.utils.ts
index 654acff728d..e722b5c6c69 100644
--- a/projects/ssr-tests/src/utils/log.utils.ts
+++ b/projects/ssr-tests/src/utils/log.utils.ts
@@ -25,41 +25,14 @@ export function clearSsrLogFile(): void {
   fs.writeFileSync(SSR_LOG_PATH, '');
 }
 
-/**
- * Validates that all lines starting with `{` are valid JSON objects.
- * Otherwise it throws an error.
- *
- * Note: multi-line JSONs (printed by SSR in dev mode) cannot be parsed by `JSON.parse`.
- *       That's why we need to to run SSR in prod mode to get single line JSON logs.
- */
-function validateJsonsInLogs(logs: string[]): void {
-  logs.forEach((text) => {
-    if (text.charAt(0) === '{') {
-      try {
-        JSON.parse(text);
-      } catch (error) {
-        throw new Error(
-          `Encountered in SSR Logs a line starting with \`{\` that could not be parsed as JSON.
-          Perhaps its a multi-line JSON log from SSR dev mode.
-          Please make sure to build Spartacus SSR in prod mode - to get single line JSONs that can be parsed in tests.`
-        );
-      }
-    }
-  });
-}
-
 /**
  * Returns raw logs as an array of strings.
  *
  * Note: Non-JSON log entries are also included in the returned array.
- *
- * It also validates whether each line starting with `{` is a valid JSON object.
- * Otherwise it throws an error.
  */
 export function getRawLogs(): string[] {
   const data = fs.readFileSync(SSR_LOG_PATH).toString();
   const logs = data.toString().split('\n');
-  validateJsonsInLogs(logs);
   return logs;
 }
 
diff --git a/projects/ssr-tests/validate-ssr-build.ts b/projects/ssr-tests/validate-ssr-build.ts
new file mode 100644
index 00000000000..7430b00c2eb
--- /dev/null
+++ b/projects/ssr-tests/validate-ssr-build.ts
@@ -0,0 +1,84 @@
+/*
+ * SPDX-FileCopyrightText: 2024 SAP Spartacus team <spartacus-team@sap.com>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Verify that the SSR app under tests meets the following criteria:
+ * 1. The app us built in prod mode.
+ *
+ *    Why it's needed:
+ *      Some tests require parsing single-line JSON log entries appearing in the SSR logs.
+ *      In an app built in prod mode, the JSON objects are printed single-line that can be easily parsed in tests.
+ *      In an app built in dev mode, the JSON objects are printed multi-line (to be more human-readable),
+ *      but cannot be parsed in tests so it makes some tests to fail.
+ *
+ * 2. The app has configured a base OCC url being a local backend proxy, instead of a real backend.
+ *
+ *    Why it's needed:
+ *      Some tests require mocking the behavior of the backend using a local backend http proxy.
+ *      If the app is not calling a local backend proxy as a base OCC url, some tests will fail.
+ *
+ *
+ * In this file we'll validate the build of the app before running the tests.
+ */
+
+import * as fs from 'fs';
+import * as path from 'path';
+
+/**
+ * String that always appears in the `main.js` file of the SSR app when built with a local backend proxy.
+ */
+const USING_PROXY_BACKEND_MARKER = `CX_BASE_URL:"http://localhost:9002"`;
+
+/**
+ * String that always appears in the `main.js` file of the SSR app when built in dev mode.
+ */
+const USING_DEV_MODE_MARKER = `ngDevMode`;
+
+/**
+ * Path to the `main.js` file of the built SSR app.
+ */
+const SSR_APP_PATH = path.join(
+  __dirname,
+  '../../dist/storefrontapp-server/main.js'
+);
+
+/**
+ * Advice to the user on how to build the SSR app in prod mode to use a local backend proxy.
+ */
+const BUILD_COMMAND_ADVICE =
+  colorToYellow('Please build the SSR app with the following command\n') +
+  colorToYellow('> npm run build && npm run build:ssr:local-http-backend\n');
+
+export default async function validateSsrBuild() {
+  if (!fs.existsSync(SSR_APP_PATH)) {
+    throw new Error(
+      `
+SSR app not found at the expected path '${SSR_APP_PATH}'. 
+${BUILD_COMMAND_ADVICE}`
+    );
+  }
+
+  const fileContents = fs.readFileSync(SSR_APP_PATH, 'utf8');
+  if (!fileContents.includes(USING_PROXY_BACKEND_MARKER)) {
+    throw new Error(
+      `
+SSR app is not using a local backend proxy as a base OCC url.
+${BUILD_COMMAND_ADVICE}`
+    );
+  }
+
+  if (fileContents.includes(USING_DEV_MODE_MARKER)) {
+    throw new Error(
+      `
+SSR app is not using prod mode.
+${BUILD_COMMAND_ADVICE}`
+    );
+  }
+}
+
+function colorToYellow(text: string) {
+  return `\x1b[33m${text}\x1b[0m`;
+}

From 7d650b34e08e06007559b848ae7a1734ade5483e Mon Sep 17 00:00:00 2001
From: Krzysztof Platis <platonn.git@gmail.com>
Date: Fri, 4 Oct 2024 18:54:20 +0200
Subject: [PATCH 5/5] test(SSR e2e): Validate http port 4000 is not used by
 other process, before running tests (#19337)

Problem:
Each SSR test starts and kills an SSR process in the background, listening on port 4000.
If you interrupt the tests that you run on local (e.g. by pressing Cmd+C), then the Jest tests process is stopped but the SSR process might be still dangling in the background.
So the next time you try to re-run SSR Tests, they'll fail with because the new SSR process cannot be started on the already occupied port 4000.

Previosuly, the we had to wait for all tests fail (30secons), until we were presented with an vague error message about port being in use. Moreover it didn't get any hint how to solve the problem.

Now, the problem is detected before running any test. The error message is descriptive and provides a hint how to kill a process that is listening on the conflicting port.

Note: Instead of detecting the problem and showing an useful message, my first strategy was to avoid the problem in general. I mean that whenever the parent Jest process is interupted, I wanted the child SSR process to be killed as well. I've tried hooks like `process.on('SIGTERM')` etc. , I've tried tampering the config of spawning the `child` process (remove `detach: true`, add `killSignal`) or calling `child.unref()`, but I had various problems - the child process was still not killed when parent was interupted or the child process couldn't be killed with `process.kill()` in the tests body

**QA steps**
1. Build SSR `npm build:libs && npm build && npm build:local-http-backend`
2. In one terminal run `npm run serve:ssr`
3. In second terminal run `npm run test:ssr`
4. Verify the following error message is presented in the second terminal:

   BEFORE:

   ![image](https://github.com/user-attachments/assets/d7df0b02-b5a7-4e42-93e4-bec7ad24fbad)

   AFTER:

   ![image](https://github.com/user-attachments/assets/da6c0659-ece9-4bec-9ba6-161d1c20d98e)

5. Kill the SSR process in the first terminal (e.g. using the commands from the advice from the console)
6. Re-run ssr tests in the second terminal and verity they pass

Fixes https://jira.tools.sap/browse/CXSPA-8587
---
 projects/ssr-tests/validate-ssr-build.ts | 56 ++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/projects/ssr-tests/validate-ssr-build.ts b/projects/ssr-tests/validate-ssr-build.ts
index 7430b00c2eb..5ff1f6503d6 100644
--- a/projects/ssr-tests/validate-ssr-build.ts
+++ b/projects/ssr-tests/validate-ssr-build.ts
@@ -6,6 +6,7 @@
 
 /**
  * Verify that the SSR app under tests meets the following criteria:
+ *
  * 1. The app us built in prod mode.
  *
  *    Why it's needed:
@@ -20,13 +21,24 @@
  *      Some tests require mocking the behavior of the backend using a local backend http proxy.
  *      If the app is not calling a local backend proxy as a base OCC url, some tests will fail.
  *
+ * 3. No other process is already listening on the HTTP port used by the SSR server.
+ *
+ *    Why it's needed:
+ *      In tests we start a new SSR server process listening on a specific port.
+ *      If anything is listening on that port, the tests will fail.
  *
  * In this file we'll validate the build of the app before running the tests.
  */
 
 import * as fs from 'fs';
+import * as http from 'http';
 import * as path from 'path';
 
+/**
+ * The port the SSR server will listen on.
+ */
+const SSR_PORT = 4000;
+
 /**
  * String that always appears in the `main.js` file of the SSR app when built with a local backend proxy.
  */
@@ -52,6 +64,22 @@ const BUILD_COMMAND_ADVICE =
   colorToYellow('Please build the SSR app with the following command\n') +
   colorToYellow('> npm run build && npm run build:ssr:local-http-backend\n');
 
+/**
+ * Advice to the user on how to kill the process listening on the port.
+ */
+export const KILL_PORT_ADVICE =
+  colorToYellow(
+    `Please kill the process listening on port ${SSR_PORT} to free the port for the SSR server.\n`
+  ) +
+  // include 2 commands that will work both on Mac and Linux for port 4000
+  colorToYellow('a) on Mac/Linux run:\n') +
+  colorToYellow(`   > kill -9 $(lsof -t -i :${SSR_PORT})\n`) +
+  colorToYellow(
+    'b) on Windows run 2 commands (to find PID and then to kill it): \n'
+  ) +
+  colorToYellow(`   > netstat -ano | findstr :${SSR_PORT}\n`) +
+  colorToYellow(`   > taskkill /f /pid <THE_PID__ABOVE> \n`);
+
 export default async function validateSsrBuild() {
   if (!fs.existsSync(SSR_APP_PATH)) {
     throw new Error(
@@ -77,8 +105,36 @@ SSR app is not using prod mode.
 ${BUILD_COMMAND_ADVICE}`
     );
   }
+
+  if (!(await isHttpPortFree(SSR_PORT))) {
+    throw new Error(
+      `
+Port ${SSR_PORT} is already in use.
+${KILL_PORT_ADVICE}`
+    );
+  }
 }
 
 function colorToYellow(text: string) {
   return `\x1b[33m${text}\x1b[0m`;
 }
+
+async function isHttpPortFree(port: number): Promise<boolean> {
+  return new Promise((resolve) => {
+    const server = http.createServer();
+
+    server.listen(port, () => {
+      server.close(() => {
+        resolve(true);
+      });
+    });
+
+    server.once('error', (error: NodeJS.ErrnoException) => {
+      if (error.code === 'EADDRINUSE') {
+        resolve(false);
+      } else {
+        resolve(true);
+      }
+    });
+  });
+}