Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop-6.5.x' into epic/CXSPA-700
Browse files Browse the repository at this point in the history
  • Loading branch information
hakwookim committed Aug 31, 2023
2 parents 5c300d7 + 566446a commit 3a6b135
Show file tree
Hide file tree
Showing 313 changed files with 8,622 additions and 1,155 deletions.
14 changes: 11 additions & 3 deletions .env-cmdrc
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,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"
Expand All @@ -42,9 +46,13 @@
"CX_B2B": "true"
},
"s4om": {
"CX_BASE_URL": "https://backoffice.c2twgq1sul-sapcxteam1-d11-public.model-t.myhybris.cloud",
"CX_CDC": "false",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_B2B": "true",
"CX_S4OM": "true"
"CX_S4OM": "true",
"CX_REQUESTED_DELIVERY_DATE": "true"
},
"requested-delivery-date": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_REQUESTED_DELIVERY_DATE": "true"
}
}
85 changes: 12 additions & 73 deletions .github/api-extractor-action/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 15 additions & 41 deletions .github/cache-builded-libs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ scripts/install/config.sh
*.launch
.settings/
*.sublime-workspace
*.swp

# IDE - VSCode
.vscode/settings.json
Expand Down
5 changes: 2 additions & 3 deletions ci-scripts/unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@ set -o pipefail

EXCLUDE_APPLICATIONS=storefrontapp
EXCLUDE_JEST=storefrontstyles,schematics,setup
EXCLUDE_INTEGRATION_LIBS=cdc,cds,digital-payments,epd-visualization,s4om

echo "-----"

function run_affected_unit_tests {
echo "Running JASMINE unit tests and code coverage for AFFECTED libraries"
npx nx affected --target=test --exclude="$EXCLUDE_APPLICATIONS,$EXCLUDE_JEST,$EXCLUDE_INTEGRATION_LIBS" -- --no-watch --source-map --code-coverage --browsers ChromeHeadless
npx nx affected --target=test --exclude="$EXCLUDE_APPLICATIONS,$EXCLUDE_JEST" -- --no-watch --source-map --code-coverage --browsers ChromeHeadless

echo "Running JEST (mostly schematics) unit tests and code coverage for AFFECTED libraries"
npx nx affected --target=test-jest --exclude="$EXCLUDE_APPLICATIONS,$EXCLUDE_INTEGRATION_LIBS" -- --coverage --runInBand
npx nx affected --target=test-jest --exclude="$EXCLUDE_APPLICATIONS" -- --coverage --runInBand
}

function run_all_unit_tests {
Expand Down
10 changes: 5 additions & 5 deletions core-libs/setup/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
24 changes: 24 additions & 0 deletions core-libs/setup/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,21 @@
"@spartacus/qualtrics/root": [
"../../feature-libs/qualtrics/root/public_api"
],
"@spartacus/requested-delivery-date/assets": [
"../../feature-libs/requested-delivery-date/assets/public_api"
],
"@spartacus/requested-delivery-date/core": [
"../../feature-libs/requested-delivery-date/core/public_api"
],
"@spartacus/requested-delivery-date": [
"../../feature-libs/requested-delivery-date/public_api"
],
"@spartacus/requested-delivery-date/occ": [
"../../feature-libs/requested-delivery-date/occ/public_api"
],
"@spartacus/requested-delivery-date/root": [
"../../feature-libs/requested-delivery-date/root/public_api"
],
"@spartacus/smartedit/core": [
"../../feature-libs/smartedit/core/public_api"
],
Expand Down Expand Up @@ -478,6 +493,9 @@
"@spartacus/cdc/organization/administration": [
"../../integration-libs/cdc/organization/administration/public_api"
],
"@spartacus/cdc/organization/user-registration": [
"../../integration-libs/cdc/organization/user-registration/public_api"
],
"@spartacus/cdc/root": ["../../integration-libs/cdc/root/public_api"],
"@spartacus/cdc/user-account": [
"../../integration-libs/cdc/user-account/public_api"
Expand Down Expand Up @@ -515,6 +533,12 @@
],
"@spartacus/s4om": ["../../integration-libs/s4om/public_api"],
"@spartacus/s4om/root": ["../../integration-libs/s4om/root/public_api"],
"@spartacus/segment-refs": [
"../../integration-libs/segment-refs/public_api"
],
"@spartacus/segment-refs/root": [
"../../integration-libs/segment-refs/root/public_api"
],
"@spartacus/assets": ["../../projects/assets/src/public_api"],
"@spartacus/core": ["../../projects/core/public_api"],
"@spartacus/storefront": ["../../projects/storefrontlib/public_api"]
Expand Down
Binary file removed docs/assets/github-branch-selector.png
Binary file not shown.
4 changes: 0 additions & 4 deletions docs/libs/creating-lib.md
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@ The following files should be modified:
- `projects/storefrontapp/src/environments/models/build.process.env.d.ts` - if creating a feature that can be toggled on/off, add your feature environment variable to the `Env` interface located in this file
- `projects/storefrontapp/src/environments/environment.ts` - if creating a feature that can be toggled on/off, set you feature for development as enabled or disabled by default
- `projects/storefrontapp/src/environments/environment.prod.ts` - if creating a feature that can be toggled on/off, pass the created env. variable to your feature
- look for `EXCLUDE_INTEGRATION_LIBS` in the entire codebase, and add the new library to the comma separated string `IF AND ONLY IF` it is a new integration library.

- Root `package.json`

Expand All @@ -353,9 +352,6 @@ Also, add the new lib to the `build:libs` and `test:libs` scripts.

- `ci-scripts/unit-tests.sh`

`IF AND ONLY IF` you are creating a new integration-lib, then include the library's name to the command separated string for `EXCLUDE_INTEGRATION_LIBS`.



### Sample data release entry ONLY if applicable

Expand Down
Loading

0 comments on commit 3a6b135

Please sign in to comment.