Merge branch 'develop-6.4.x' into epic/opf

.env-cmdrc

@@ -38,6 +38,10 @@
     "CX_B2B": "true",
     "CX_CPQ": "true"
   },
+  "segment-refs": {
+    "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-p7-public.model-t.myhybris.cloud",
+    "CX_SEGMENT_REFS": "true"
+  },
   "b2c": {
     "CX_B2B": "false",
     "CX_CDS": "false"

.eslintrc.json

@@ -93,7 +93,8 @@
               }
             ]
           }
-        ]
+        ],
+        "no-console": "error"
       }
     },
     {

.github/CODEOWNERS

@@ -50,6 +50,11 @@
 # ================================================
 /feature-libs/asm/          @SAP/spartacus-codeowners @SAP/spartacus-holidays
 
+# ================================================
+#  User domain
+# ================================================
+/feature-libs/user/          @SAP/spartacus-codeowners @SAP/spartacus-holidays
+
 # ================================================
 #  Product Configurator and CPQ integration
 # ================================================

.gitignore

@@ -38,6 +38,7 @@ scripts/install/config.sh
 *.launch
 .settings/
 *.sublime-workspace
+*.swp
 
 # IDE - VSCode
 .vscode/settings.json

core-libs/setup/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/setup",
-  "version": "5.0.0",
+  "version": "6.3.0-1",
   "description": "Includes features that makes Spartacus and it's setup easier and streamlined.",
   "keywords": [
     "spartacus",
@@ -20,10 +20,10 @@
   },
   "peerDependencies": {
     "@angular/core": "^15.2.4",
-    "@spartacus/cart": "5.0.0",
-    "@spartacus/core": "5.0.0",
-    "@spartacus/order": "5.0.0",
-    "@spartacus/user": "5.0.0"
+    "@spartacus/cart": "6.3.0-1",
+    "@spartacus/core": "6.3.0-1",
+    "@spartacus/order": "6.3.0-1",
+    "@spartacus/user": "6.3.0-1"
   },
   "optionalDependencies": {
     "@angular/platform-server": "^15.2.4",

core-libs/setup/ssr/engine-decorator/ng-express-engine-decorator.spec.ts

@@ -1,16 +1,19 @@
 import { NgSetupOptions, RenderOptions } from '@nguniversal/express-engine';
 import { SERVER_REQUEST_URL } from '@spartacus/core';
+import { EXPRESS_SERVER_LOGGER, LegacyExpressServerLogger } from '../logger';
 import {
-  decorateExpressEngine,
   NgExpressEngine,
   NgExpressEngineDecorator,
   NgExpressEngineInstance,
+  decorateExpressEngine,
 } from './ng-express-engine-decorator';
 
 jest.mock('fs', () => ({
   readFileSync: () => '',
 }));
 
+jest.spyOn(console, 'log').mockImplementation(() => {});
+
 describe('NgExpressEngineDecorator', () => {
   describe('get', () => {
     let originalEngine: NgExpressEngine;
@@ -100,9 +103,10 @@ describe('decorateExpressEngine', () => {
         get: jest.fn(() => 'site.com'),
         app,
         connection: {},
-      },
-      res: <Partial<Response>>{
-        set: jest.fn(() => {}),
+        res: <Partial<Response>>{
+          set: jest.fn(() => {}),
+          locals: {},
+        },
       },
     } as any;
 
@@ -184,7 +188,15 @@ describe('decorateExpressEngine', () => {
     it(`should pass parameters to the original engine instance`, () => {
       expect(originalEngineInstance).toHaveBeenCalledWith(
         mockPath,
-        mockOptions,
+        {
+          ...mockOptions,
+          providers: [
+            {
+              provide: EXPRESS_SERVER_LOGGER,
+              useValue: new LegacyExpressServerLogger(),
+            },
+          ],
+        },
         expect.any(Function)
       );
     });
@@ -252,7 +264,15 @@ describe('decorateExpressEngine', () => {
     it(`should pass parameters to the original engine instance`, () => {
       expect(originalEngineInstance).toHaveBeenCalledWith(
         mockPath,
-        mockOptions,
+        {
+          ...mockOptions,
+          providers: [
+            {
+              provide: EXPRESS_SERVER_LOGGER,
+              useValue: new LegacyExpressServerLogger(),
+            },
+          ],
+        },
         expect.any(Function)
       );
     });

core-libs/setup/ssr/logger/index.ts

@@ -0,0 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './loggers/index';
+export * from './services/index';