Merge branch 'develop' into epic/opf

SAP · Jul 31, 2024 · 00e3d72 · 00e3d72
2 parents 6803be5 + fb85364
commit 00e3d72
Show file tree

Hide file tree

Showing 65 changed files with 735 additions and 459 deletions.
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
@@ -1,4 +1,4 @@
-version: 1
+version: 2
 update_configs:
   - package_manager: "javascript"
     directory: "/"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -250,7 +250,7 @@ jobs:
       - name: Notify the slack channel of when build conclusion failed
         env:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_TOKEN }}
-        uses: slackapi/slack-github-action@v1.24.0
+        uses: slackapi/slack-github-action@v1.26.0
         with:
           channel-id: ${{ secrets.SLACK_NOTIFICATION_CHANNEL }}
           payload: |

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -19,9 +19,11 @@ on:
   schedule:
     - cron: '45 2 * * *'
 
+
 jobs:
   analyze:
     name: Analyze (${{ matrix.language }})
+
     # Runner size impacts CodeQL analysis time. To learn more, please see:
     #   - https://gh.io/recommended-hardware-resources-for-running-codeql
     #   - https://gh.io/supported-runners-and-hardware-resources
@@ -62,6 +64,13 @@ jobs:
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
       with:
+        config: |
+          name: Disable scan for tests
+          paths-ignore:
+            - "projects/storefrontapp-e2e-cypress/**"
+            - "**/*.spec.ts"
+            - "**/*.spec.js"
+            - "**/*_spec.ts"
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
         # If you wish to specify custom queries, you can do so here or in a config file.

diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/setup",
-  "version": "2211.25.1",
+  "version": "2211.27.0-2",
   "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.25.1",
-    "@spartacus/core": "2211.25.1",
-    "@spartacus/order": "2211.25.1",
-    "@spartacus/user": "2211.25.1"
+    "@spartacus/cart": "2211.27.0-2",
+    "@spartacus/core": "2211.27.0-2",
+    "@spartacus/order": "2211.27.0-2",
+    "@spartacus/user": "2211.27.0-2"
   },
   "optionalDependencies": {
     "@angular/platform-server": "^17.0.5",

diff --git a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts
@@ -175,7 +175,6 @@ describe('OptimizedSsrEngine', () => {
               "forcedSsrTimeout": 60000,
               "maxRenderTime": 300000,
               "reuseCurrentRendering": true,
-              "debug": false,
               "renderingStrategyResolver": "() => ssr_optimization_options_1.RenderingStrategy.ALWAYS_SSR",
               "logger": "DefaultExpressServerLogger"
             }
@@ -1275,7 +1274,6 @@ describe('OptimizedSsrEngine', () => {
               "forcedSsrTimeout": 60000,
               "maxRenderTime": 300000,
               "reuseCurrentRendering": true,
-              "debug": false,
               "renderingStrategyResolver": "(request) => {\\n    if (hasExcludedUrl(request, defaultAlwaysCsrOptions.excludedUrls)) {\\n        return ssr_optimization_options_1.RenderingStrategy.ALWAYS_CSR;\\n    }\\n    return shouldFallbackToCsr(request, options)\\n        ? ssr_optimization_options_1.RenderingStrategy.ALWAYS_CSR\\n        : ssr_optimization_options_1.RenderingStrategy.DEFAULT;\\n}",
               "logger": "DefaultExpressServerLogger"
             }
@@ -1296,7 +1294,6 @@ describe('OptimizedSsrEngine', () => {
                 "options": {
                   "cacheSize": 3000,
                   "concurrency": 10,
-                  "debug": false,
                   "forcedSsrTimeout": 60000,
                   "logger": "MockExpressServerLogger",
                   "maxRenderTime": 300000,

diff --git a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts
@@ -318,14 +318,15 @@ export class OptimizedSsrEngine {
     });
   }
 
+  /**
+   * @deprecated since v2211.27 - This method will be private in the future.
+   */
   protected log(
     message: string,
-    debug = true,
+    _ignoredLegacyDebugParameter = true,
     context: ExpressServerLoggerContext
   ): void {
-    if (debug || this.ssrOptions?.debug) {
-      this.logger.log(message, context || {});
-    }
+    this.logger.log(message, context || {});
   }
 
   /** Retrieve the document from the cache or the filesystem */

diff --git a/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts b/core-libs/setup/ssr/optimized-engine/ssr-optimization-options.ts
@@ -114,7 +114,13 @@ export interface SsrOptimizationOptions {
   reuseCurrentRendering?: boolean;
 
   /**
-   * Enable detailed logs for troubleshooting problems
+   * @deprecated - This flag is not used anymore since v2211.27.
+   *
+   * Now all the information about the traffic and rendering is logged unconditionally:
+   * - receiving requests
+   * - responding to requests (either with HTML result, error or fallback to CSR)
+   * - start and end of renders
+   * - timeout of renders (due to passing `maxRenderTime`)
    */
   debug?: boolean;
 
@@ -145,7 +151,6 @@ export const defaultSsrOptimizationOptions: SsrOptimizationOptions = {
   forcedSsrTimeout: 60_000,
   maxRenderTime: 300_000,
   reuseCurrentRendering: true,
-  debug: false,
   renderingStrategyResolver: defaultRenderingStrategyResolver(
     defaultRenderingStrategyResolverOptions
   ),

diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/asm",
-  "version": "2211.25.1",
+  "version": "2211.27.0-2",
   "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.25.1",
-    "@spartacus/core": "2211.25.1",
-    "@spartacus/order": "2211.25.1",
-    "@spartacus/schematics": "2211.25.1",
-    "@spartacus/storefinder": "2211.25.1",
-    "@spartacus/storefront": "2211.25.1",
-    "@spartacus/styles": "2211.25.1",
-    "@spartacus/user": "2211.25.1",
+    "@spartacus/cart": "2211.27.0-2",
+    "@spartacus/core": "2211.27.0-2",
+    "@spartacus/order": "2211.27.0-2",
+    "@spartacus/schematics": "2211.27.0-2",
+    "@spartacus/storefinder": "2211.27.0-2",
+    "@spartacus/storefront": "2211.27.0-2",
+    "@spartacus/styles": "2211.27.0-2",
+    "@spartacus/user": "2211.27.0-2",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cart",
-  "version": "2211.25.1",
+  "version": "2211.27.0-2",
   "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.25.1",
-    "@spartacus/schematics": "2211.25.1",
-    "@spartacus/storefront": "2211.25.1",
-    "@spartacus/styles": "2211.25.1",
-    "@spartacus/user": "2211.25.1",
+    "@spartacus/core": "2211.27.0-2",
+    "@spartacus/schematics": "2211.27.0-2",
+    "@spartacus/storefront": "2211.27.0-2",
+    "@spartacus/styles": "2211.27.0-2",
+    "@spartacus/user": "2211.27.0-2",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },

diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/checkout",
-  "version": "2211.25.1",
+  "version": "2211.27.0-2",
   "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.25.1",
-    "@spartacus/core": "2211.25.1",
-    "@spartacus/order": "2211.25.1",
-    "@spartacus/schematics": "2211.25.1",
-    "@spartacus/storefront": "2211.25.1",
-    "@spartacus/styles": "2211.25.1",
-    "@spartacus/user": "2211.25.1",
+    "@spartacus/cart": "2211.27.0-2",
+    "@spartacus/core": "2211.27.0-2",
+    "@spartacus/order": "2211.27.0-2",
+    "@spartacus/schematics": "2211.27.0-2",
+    "@spartacus/storefront": "2211.27.0-2",
+    "@spartacus/styles": "2211.27.0-2",
+    "@spartacus/user": "2211.27.0-2",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },

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

diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/customer-ticketing",
-  "version": "2211.25.1",
+  "version": "2211.27.0-2",
   "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.25.1",
-    "@spartacus/core": "2211.25.1",
-    "@spartacus/schematics": "2211.25.1",
-    "@spartacus/storefront": "2211.25.1",
-    "@spartacus/styles": "2211.25.1",
+    "@spartacus/cart": "2211.27.0-2",
+    "@spartacus/core": "2211.27.0-2",
+    "@spartacus/schematics": "2211.27.0-2",
+    "@spartacus/storefront": "2211.27.0-2",
+    "@spartacus/styles": "2211.27.0-2",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/estimated-delivery-date/package.json b/feature-libs/estimated-delivery-date/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/estimated-delivery-date",
-  "version": "2211.25.1",
+  "version": "2211.27.0-2",
   "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.25.1",
-    "@spartacus/core": "2211.25.1",
-    "@spartacus/order": "2211.25.1",
-    "@spartacus/schematics": "2211.25.1",
-    "@spartacus/storefront": "2211.25.1",
-    "@spartacus/styles": "2211.25.1",
+    "@spartacus/cart": "2211.27.0-2",
+    "@spartacus/core": "2211.27.0-2",
+    "@spartacus/order": "2211.27.0-2",
+    "@spartacus/schematics": "2211.27.0-2",
+    "@spartacus/storefront": "2211.27.0-2",
+    "@spartacus/styles": "2211.27.0-2",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/order/package.json b/feature-libs/order/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/order",
-  "version": "2211.25.1",
+  "version": "2211.27.0-2",
   "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.25.1",
-    "@spartacus/core": "2211.25.1",
-    "@spartacus/pdf-invoices": "2211.25.1",
-    "@spartacus/schematics": "2211.25.1",
-    "@spartacus/storefront": "2211.25.1",
-    "@spartacus/styles": "2211.25.1",
-    "@spartacus/user": "2211.25.1",
+    "@spartacus/cart": "2211.27.0-2",
+    "@spartacus/core": "2211.27.0-2",
+    "@spartacus/pdf-invoices": "2211.27.0-2",
+    "@spartacus/schematics": "2211.27.0-2",
+    "@spartacus/storefront": "2211.27.0-2",
+    "@spartacus/styles": "2211.27.0-2",
+    "@spartacus/user": "2211.27.0-2",
     "rxjs": "^7.8.0"
   },
   "publishConfig": {

diff --git a/feature-libs/organization/package.json b/feature-libs/organization/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/organization",
-  "version": "2211.25.1",
+  "version": "2211.27.0-2",
   "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.25.1",
-    "@spartacus/core": "2211.25.1",
-    "@spartacus/order": "2211.25.1",
-    "@spartacus/schematics": "2211.25.1",
-    "@spartacus/storefront": "2211.25.1",
-    "@spartacus/styles": "2211.25.1",
-    "@spartacus/user": "2211.25.1",
+    "@spartacus/cart": "2211.27.0-2",
+    "@spartacus/core": "2211.27.0-2",
+    "@spartacus/order": "2211.27.0-2",
+    "@spartacus/schematics": "2211.27.0-2",
+    "@spartacus/storefront": "2211.27.0-2",
+    "@spartacus/styles": "2211.27.0-2",
+    "@spartacus/user": "2211.27.0-2",
     "bootstrap": "^4.6.2",
     "rxjs": "^7.8.0"
   },

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