Merge branch 'develop-6.5.x' into epic/CXSPA-700

SAP · Sep 27, 2023 · 2e559f6 · 2e559f6
2 parents 1eef230 + 0dd42d4
commit 2e559f6
Show file tree

Hide file tree

Showing 212 changed files with 7,619 additions and 1,104 deletions.
diff --git a/.env-cmdrc b/.env-cmdrc
@@ -49,10 +49,15 @@
     "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
     "CX_B2B": "true",
     "CX_S4OM": "true",
-    "CX_REQUESTED_DELIVERY_DATE": "true"
+    "CX_REQUESTED_DELIVERY_DATE": "true",
+    "CX_PDF_INVOICES": "true"
   },
   "requested-delivery-date": {
     "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
     "CX_REQUESTED_DELIVERY_DATE": "true"
+  },
+  "pdf-invoices": {
+    "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
+    "CX_PDF_INVOICES": "true"
   }
 }
diff --git a/.github/workflows/cache-node-modules.yml b/.github/workflows/cache-node-modules.yml
@@ -8,7 +8,7 @@ on:
 name: Cache node modules
 
 env:
-  NODE_VERSION: '16'
+  NODE_VERSION: '18'
 
 jobs:
   cacheNodeModules:   

diff --git a/.github/workflows/ci-continuous-integration.yml b/.github/workflows/ci-continuous-integration.yml
@@ -10,7 +10,7 @@ on:
     # empty as it is used only to manually trigger the workflow
 
 env:
-  NODE_VERSION: '16'
+  NODE_VERSION: '18'
   NX_BASE: origin/${{ github.event.pull_request.base.ref }}
   NX_HEAD: origin/${{ github.event.pull_request.head.ref }}
 

diff --git a/.github/workflows/ci-merge-checks.yml b/.github/workflows/ci-merge-checks.yml
@@ -11,7 +11,7 @@ on:
 env:
   CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }}
   GH_TOKEN: ${{ github.token }}
-  NODE_VERSION: '16'
+  NODE_VERSION: '18'
 
 concurrency: 
   group: ci-merge-checks-${{ github.head_ref || github.run_id }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }}
-  NODE_VERSION: '16'
+  NODE_VERSION: '18'
 
 concurrency:
   group: ci-${{ github.head_ref || github.run_id }}

diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml
@@ -9,7 +9,7 @@ on:
     # empty as it is used only to manually trigger the workflow
 env:
   CYPRESS_KEY: ${{ secrets.CYPRESS_KEY }}
-  NODE_VERSION: '16'
+  NODE_VERSION: '18'
 
 concurrency: 
   group: lighthouse-${{ github.head_ref || github.run_id }}

diff --git a/ci-scripts/e2e-cypress.sh b/ci-scripts/e2e-cypress.sh
@@ -57,6 +57,8 @@ fi
 echo '-----'
 echo "Building Spartacus libraries"
 
+export NODE_OPTIONS=--dns-result-order=ipv4first
+
 npm ci
 
 (cd projects/storefrontapp-e2e-cypress && npm ci)

diff --git a/ci-scripts/lhci.sh b/ci-scripts/lhci.sh
@@ -2,6 +2,7 @@
 set -e
 
 export SPA_ENV='lighthouse'
+export NODE_OPTIONS=--dns-result-order=ipv4first
 
 npm install -g @lhci/[email protected]
 

diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/setup",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Includes features that makes Spartacus and it's setup easier and streamlined.",
   "keywords": [
     "spartacus",
@@ -16,17 +16,17 @@
     "test": "../../node_modules/.bin/jest --config ./jest.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular/core": "^15.2.4",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1"
+    "@angular/core": "^15.2.9",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1"
   },
   "optionalDependencies": {
-    "@angular/platform-server": "^15.2.4",
+    "@angular/platform-server": "^15.2.9",
     "@nguniversal/express-engine": "^15.2.0",
     "express": "^4.18.2"
   },

diff --git a/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver-options.ts b/core-libs/setup/ssr/optimized-engine/rendering-strategy-resolver-options.ts
@@ -11,6 +11,6 @@ export interface RenderingStrategyResolverOptions {
 
 export const defaultRenderingStrategyResolverOptions: RenderingStrategyResolverOptions =
   {
-    excludedUrls: ['checkout', 'my-account'],
+    excludedUrls: ['checkout', 'my-account', 'cx-preview'],
     excludedParams: ['asm'],
   };
diff --git a/core-libs/setup/tsconfig.spec.json b/core-libs/setup/tsconfig.spec.json
@@ -280,6 +280,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],

diff --git a/extra-webpack.config.js b/extra-webpack.config.js
@@ -29,6 +29,10 @@ module.exports = {
         __dirname,
         'feature-libs/organization'
       ),
+      '@spartacus/pdf-invoices': path.join(
+        __dirname,
+        'feature-libs/pdf-invoices'
+      ),
       '@spartacus/product': path.join(__dirname, 'feature-libs/product'),
       '@spartacus/product-configurator': path.join(
         __dirname,

diff --git a/feature-libs/asm/karma.conf.js b/feature-libs/asm/karma.conf.js
@@ -42,6 +42,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,

diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/asm",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "ASM feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,25 +22,25 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/platform-browser": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/platform-browser": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefinder": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefinder": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "rxjs": "^6.6.0"
   },
   "publishConfig": {

diff --git a/feature-libs/asm/tsconfig.schematics.json b/feature-libs/asm/tsconfig.schematics.json
@@ -277,6 +277,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],

diff --git a/feature-libs/cart/karma.conf.js b/feature-libs/cart/karma.conf.js
@@ -37,6 +37,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,

diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/cart",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "",
   "keywords": [
     "spartacus",
@@ -26,22 +26,22 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.0"
   },

diff --git a/feature-libs/cart/tsconfig.schematics.json b/feature-libs/cart/tsconfig.schematics.json
@@ -277,6 +277,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],

diff --git a/feature-libs/checkout/karma.conf.js b/feature-libs/checkout/karma.conf.js
@@ -37,6 +37,10 @@ module.exports = function (config) {
         },
       },
     },
+    captureTimeout: 210000,
+    browserDisconnectTolerance: 3,
+    browserDisconnectTimeout: 210000,
+    browserNoActivityTimeout: 210000,
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,

diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/checkout",
-  "version": "6.3.0-1",
+  "version": "6.5.0-1",
   "description": "Checkout feature library for Spartacus",
   "keywords": [
     "spartacus",
@@ -22,23 +22,23 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
-    "@spartacus/cart": "6.3.0-1",
-    "@spartacus/core": "6.3.0-1",
-    "@spartacus/order": "6.3.0-1",
-    "@spartacus/schematics": "6.3.0-1",
-    "@spartacus/storefront": "6.3.0-1",
-    "@spartacus/styles": "6.3.0-1",
-    "@spartacus/user": "6.3.0-1",
+    "@spartacus/cart": "6.5.0-1",
+    "@spartacus/core": "6.5.0-1",
+    "@spartacus/order": "6.5.0-1",
+    "@spartacus/schematics": "6.5.0-1",
+    "@spartacus/storefront": "6.5.0-1",
+    "@spartacus/styles": "6.5.0-1",
+    "@spartacus/user": "6.5.0-1",
     "bootstrap": "^4.6.2",
     "rxjs": "^6.6.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: '6.3'
+      level: '6.5'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })
@@ -506,7 +506,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu
     },
   }), provideConfig(<FeaturesConfig>{
     features: {
-      level: '6.3'
+      level: '6.5'
     }
   }), provideConfig(defaultB2bOccConfig)]
 })