Skip to content

Commit

Permalink
Merge branch 'develop' into epic/punchout
Browse files Browse the repository at this point in the history
  • Loading branch information
FollowTheFlo committed Oct 3, 2024
2 parents 661ac8e + 23b72bb commit 5e988b7
Show file tree
Hide file tree
Showing 8,655 changed files with 385,264 additions and 81,078 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .dependabot/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 1
version: 2
update_configs:
- package_manager: "javascript"
directory: "/"
Expand Down
54 changes: 52 additions & 2 deletions .env-cmdrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
"local": {
"CX_BASE_URL": "https://localhost:9002"
},
"local-http": {
"CX_BASE_URL": "http://localhost:9002"
},
"ci": {
"CX_BASE_URL": "https://20.83.184.244:9002"
},
Expand All @@ -18,7 +21,7 @@
"CX_BASE_URL": "https://api.spartacus.rocks"
},
"cdc": {
"CX_BASE_URL": "https://cdc-spa-2011-2102.demo.hybris.com",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s1-public.model-t.myhybris.cloud",
"CX_CDC": "true"
},
"digital-payments": {
Expand All @@ -30,15 +33,62 @@
"CX_BASE_URL": "https://api.cp96avkh5f-integrati1-d1-public.model-t.cc.commerce.ondemand.com"
},
"cpq": {
"CX_BASE_URL": "https://api.cpce-teamtiger1-d2-public.model-t.cc.commerce.ondemand.com",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s1-public.model-t.myhybris.cloud/",
"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"
},
"b2b": {
"CX_B2B": "true"
},
"s4om": {
"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_PDF_INVOICES": "true"
},
"omf":{
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s9-public.model-t.myhybris.cloud",
"CX_OMF": "true"
},
"requested-delivery-date": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_REQUESTED_DELIVERY_DATE": "true"
},
"estimated-delivery-date": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
"CX_ESTIMATED_DELIVERY_DATE": "true"
},
"pdf-invoices": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
"CX_PDF_INVOICES": "true"
},
"my-account-v2":{
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
"CX_PDF_INVOICES": "true",
"CX_MY_ACCOUNT_V2": "true"
},
"cdp":{
"CX_CDP": "true",
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
"CX_PDF_INVOICES": "true",
"CX_MY_ACCOUNT_V2": "true"
},
"opps":{
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
"CX_OPPS": "true"
},
"s4-service":{
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_S4_SERVICE": "true",
"CX_B2B": "true"
}
}
71 changes: 50 additions & 21 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,18 @@
"root": true,
"overrides": [
{
"files": [
"*.ts"
],
"files": ["*.ts"],
"parserOptions": {
"project": [
"tsconfig.eslint.json"
],
"project": ["tsconfig.eslint.json"],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/ng-cli-compat",
"plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
"plugin:@angular-eslint/template/process-inline-templates"
],
"plugins": [
"deprecation"
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates",
"./tools/eslint-plugins/legacy-ng-cli-compat",
"./tools/eslint-plugins/legacy-ng-cli-compat--formatting-add-on"
],
"plugins": ["deprecation", "@typescript-eslint", "@nx"],
"rules": {
"@angular-eslint/no-host-metadata-property": "off",
"@typescript-eslint/no-empty-interface": "off",
Expand Down Expand Up @@ -73,24 +68,58 @@
"id-blacklist": "off",
"id-match": "off",
"max-len": "off",
"linebreak-style": [
"linebreak-style": ["error", "unix"],
"no-underscore-dangle": "off",
"@nx/enforce-module-boundaries": [
"error",
"unix"
{
"allow": [],
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"],
"notDependOnLibsWithTags": ["type:app"]
},
{
"sourceTag": "type:feature",
"notDependOnLibsWithTags": ["type:integration"]
},
{
"sourceTag": "type:ui",
"notDependOnLibsWithTags": ["type:feature"]
},
{
"sourceTag": "scope:core",
"notDependOnLibsWithTags": ["type:ui", "type:feature"]
}
]
}
],
"no-underscore-dangle": "off"
"no-console": "error"
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended"
],
"files": ["*.html"],
"extends": ["plugin:@angular-eslint/template/recommended"],
"rules": {
"@angular-eslint/template/no-negated-async": "off",
"@angular-eslint/template/eqeqeq": "error"
}
},
{
"files": ["*.module.ts"],
"rules": {
"@nx/workspace/use-provide-default-config": "error",
"@nx/workspace/use-provide-default-config-factory": "error",
"@nx/workspace/use-provide-default-feature-toggles": "error",
"@nx/workspace/use-provide-default-feature-toggles-factory": "error"
}
},
{
"files": ["*.action*.ts"],
"rules": {
"@nx/workspace/no-ngrx-fail-action-without-error-action-implementation": "error"
}
}
]
}
83 changes: 30 additions & 53 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@
#
# More info: https://help.github.com/articles/about-codeowners/
#

# This is ONLY INITIAL CODEOWNERS file created to test and gradually introduce ownership
# of specific features on a code level.


# ================================================
# General rules / philosophy
# ================================================
Expand All @@ -22,85 +17,67 @@
# - we enforce that only approved PRs get merged to ensure that unreviewed code doesn't get accidentally merged
# - we delegate approval rights as much as possible so that we can scale better
# - each group must have at least one person, but several people are preferable to avoid a single point of failure issues
# - most file groups have a global approvers group as fallback:
# - @SAP/spartacus-global-owners: for approving minor changes, large-scale refactorings, and emergency situations.
# - a small number of file groups can have very limited number of reviewers because incorrect changes to the files they guard would have serious consequences (e.g. security, public api)
# - a small number of file groups may have very limited number of reviewers because incorrect changes to the files they guard would have serious consequences (e.g. security, public api)
#
# Configuration nuances:
#
# - This configuration works in conjunction with the protected branch settings that require all changes to be made via pull requests with at least one approval.
# - This approval can come from an appropriate codeowner, or any repo collaborator (person with write access) if the PR is authored by a codeowner.
# - Each codeowners team must have write access to the repo, otherwise their reviews won't count.


# ================================================
# GitHub username registry
# (just to make this file easier to understand)
# All the files in the repo.
# ================================================
* @SAP/spartacus-codeowners

# Platonn - Krzysztof Platis
# znikola - Nikola Zarić
# developpeurweb - Miguel Estrada
# psmul - Patryk Smul
# plabadie - Patrick Labadie
# WeizhengSap - Weizheng Gao
# hackergil - Gilberto Alvarado Jimenez

######################################################################################################
#
# CODEOWNERS rules
# -----------------
#
# All the following rules are applied in the order specified in this file.
# The last rule that matches wins!
#
# See https://git-scm.com/docs/gitignore#_pattern_format for pattern syntax docs.
#
######################################################################################################
# ================================================
# This code owners file
# ================================================
/.github/CODEOWNERS @SAP/spartacus-admins

# ================================================
# Default Owners
# (in case no pattern matches a path in a PR - this should be treated as a bug and result in adding the path to CODEOWNERS)
# Folders where anyone with write access to the repo can approve Pull Requests
# ================================================
/docs/
/projects/storefrontapp-e2e-cypress/

# * @SAP/spartacus-codeowners
# @SAP/spartacus-codeowners needs to be repeated in each subsequent rules
# to remain owner of all the sources in the repo.

# ================================================
# Core
# ASM
# ================================================
/projects/core/** @SAP/spartacus-codeowners
/projects/storefrontlib/** @SAP/spartacus-codeowners
/feature-libs/** @SAP/spartacus-codeowners
/core-libs/** @SAP/spartacus-codeowners
/ci-scripts/** @SAP/spartacus-codeowners
/scripts/** @SAP/spartacus-codeowners
/tools/** @SAP/spartacus-codeowners
/* @SAP/spartacus-codeowners

/feature-libs/asm/ @SAP/spartacus-codeowners @SAP/spartacus-holidays

# ================================================
# Styles
# User domain
# ================================================
/projects/storefrontstyles/** @SAP/spartacus-codeowners
/feature-libs/user/ @SAP/spartacus-codeowners @SAP/spartacus-holidays
/projects/storefrontlib/cms-components/myaccount/ @SAP/spartacus-codeowners @SAP/spartacus-holidays

# ================================================
# Cart
# Product Configurator (VC and CPQ) integration
# ================================================
/projects/storefrontlib/cms-components/cart/** @SAP/spartacus-codeowners
/feature-libs/product-configurator/ @SAP/spartacus-codeowners @SAP/spartacus-CPQ

# ================================================
# Schematics
# Quotes
# ================================================
/projects/schematics/** @SAP/spartacus-codeowners
/feature-libs/quote/ @SAP/spartacus-codeowners @SAP/spartacus-mooncake

# ================================================
# CODEOWNERS and workflows
# Intelligent services (ISS)
# ================================================
/.github/** @SAP/spartacus-codeowners
/integration-libs/cds/ @SAP/spartacus-codeowners @SAP/spartacus-CDS

######################################################################################################
# ================================================
# (CDC)
# ================================================
/integration-libs/cdc/ @SAP/spartacus-codeowners @SAP/spartacus-CDC

# ================================================
# Product configurator feature and CPQ integration
# BOPIS
# ================================================
/feature-libs/product-configurator/** @SAP/spartacus-codeowners @SAP/spartacus-CPQ
/feature-libs/pickup-in-store/ @SAP/spartacus-codeowners @SAP/spartacus-colossus

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/epic_release.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The following is a checklist for new epics or features acceptance for Spartacus,
- [ ] Epic complies with [Security best practices](https://sap.github.io/spartacus-docs/security-best-practices/)
- [ ] Epic complies with [Accessibility best practices](https://sap.github.io/spartacus-docs/a11y-best-practices/)
- [ ] Epic CSS supports directionality (if required)
- [ ] Epic code scans have been conducted (sonar, whitesource, checkmarx)
- [ ] Epic code scans have been conducted [Compliance scans for branches](https://wiki.one.int.sap/wiki/display/spar/Compliance+scans+for+branches)
- [ ] Epic renders successfully in SSR

## Audits/reviews
Expand Down
Loading

0 comments on commit 5e988b7

Please sign in to comment.