Merge branch 'develop' into 'master' for 5.0.0 release

intershop · Dec 31, 2023 · 6ad9aa4 · 6ad9aa4
2 parents b2bc0ca + 7c048b0
commit 6ad9aa4
Show file tree

Hide file tree

Showing 719 changed files with 14,393 additions and 14,584 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -23,25 +23,20 @@
   "extensions": [
     // synchronize-marker:vscode-extensions:begin
     // general
-    "eamodio.gitlens",
     "vscode-icons-team.vscode-icons",
-    "vincaslt.highlight-matching-tag",
     // code assist
     "visualstudioexptteam.vscodeintellicode",
     "angular.ng-template",
     "mikael.angular-beastcode",
-    "formulahendry.auto-rename-tag",
     // code style + formatting
     "editorconfig.editorconfig",
     "esbenp.prettier-vscode",
     "stylelint.vscode-stylelint",
-    "csstools.postcss",
     "dbaeumer.vscode-eslint",
     // testing
     "andys8.jest-snippets",
     // documentation
-    "streetsidesoftware.code-spell-checker",
-    "yzhang.markdown-all-in-one"
+    "streetsidesoftware.code-spell-checker"
     // synchronize-marker:vscode-extensions:end
   ],
   "forwardPorts": [4200],

diff --git a/.dockerignore b/.dockerignore
@@ -43,11 +43,22 @@
 /e2e/node_modules
 /e2e/reports
 
+# from e2e/cypress/.gitignore
+/e2e/cypress/videos
+/e2e/cypress/screenshots
+/e2e/cypress/logs
+
 # from eslint-rules/.gitignore
 /eslint-rules/node_modules
 /eslint-rules/package-lock.json
 /eslint-rules/dist
 
+# from projects/organization-management/src/app/exports/.gitignore
+/projects/organization-management/src/app/exports/**/lazy*
+
+# from projects/requisition-management/src/app/exports/.gitignore
+/projects/requisition-management/src/app/exports/**/lazy*
+
 # from reports/.gitignore
 /reports/junit.xml
 /reports/unit-tests.html
@@ -63,31 +74,8 @@
 /schematics/dist
 /schematics/package-lock.json
 
-# from e2e/cypress/.gitignore
-/e2e/cypress/videos
-/e2e/cypress/screenshots
-/e2e/cypress/logs
-
-# from node_modules/eslint-plugin-ish-custom-rules/.gitignore
-/node_modules/eslint-plugin-ish-custom-rules/node_modules
-/node_modules/eslint-plugin-ish-custom-rules/package-lock.json
-/node_modules/eslint-plugin-ish-custom-rules/dist
-
-# from node_modules/intershop-schematics/.gitignore
-/node_modules/intershop-schematics/dist
-/node_modules/intershop-schematics/package-lock.json
-
-# from src/ssr/server-scripts/.gitignore
-/src/ssr/server-scripts/ecosystem-ports.json
-
-# from src/app/shell/shared/.gitignore
-/src/app/shell/shared/**/lazy*
-
-# from projects/organization-management/src/app/exports/.gitignore
-/projects/organization-management/src/app/exports/**/lazy*
-
-# from projects/requisition-management/src/app/exports/.gitignore
-/projects/requisition-management/src/app/exports/**/lazy*
+# from schematics/src/extension/files/__name@dasherize__/exports/.gitignore
+/schematics/src/extension/files/__name@dasherize__/exports/**/lazy*
 
 # from src/app/extensions/address-doctor/exports/.gitignore
 /src/app/extensions/address-doctor/exports/**/lazy*
@@ -125,8 +113,11 @@
 # from src/app/extensions/wishlists/exports/.gitignore
 /src/app/extensions/wishlists/exports/**/lazy*
 
-# from schematics/src/extension/files/__name@dasherize__/exports/.gitignore
-/schematics/src/extension/files/__name@dasherize__/exports/**/lazy*
+# from src/app/shell/shared/.gitignore
+/src/app/shell/shared/**/lazy*
+
+# from src/ssr/server-scripts/.gitignore
+/src/ssr/server-scripts/ecosystem-ports.json
 
 # The content between these markers is generated.
 # It can be synchronized using 'npm run update-dockerignore'

diff --git a/.eslintrc.json b/.eslintrc.json
@@ -4,14 +4,11 @@
     {
       "files": ["*.ts"],
       "parserOptions": {
-        "project": [
-          "tsconfig.json",
-          "e2e/cypress/tsconfig.json",
-          "schematics/tsconfig.json"
-        ],
+        "project": ["tsconfig.json"],
         "createDefaultProgram": true
       },
       "extends": [
+        "plugin:@typescript-eslint/recommended",
         "plugin:@angular-eslint/recommended",
         "plugin:@angular-eslint/template/process-inline-templates",
         "plugin:@ngrx/recommended",
@@ -26,6 +23,7 @@
         "jsdoc",
         "unicorn",
         "unused-imports",
+        "@typescript-eslint",
         "ish-custom-rules"
       ],
       "rules": {
@@ -50,7 +48,6 @@
         "@ngrx/avoid-mapping-selectors": "off",
         "@ngrx/no-store-subscription": "off",
         "@ngrx/prefer-effect-callback-in-block-statement": "off",
-        "@ngrx/prefer-concat-latest-from": "off",
         "@ngrx/prefix-selectors-with-select": "off",
         "@ngrx/select-style": ["warn", "operator"],
         "@typescript-eslint/ban-tslint-comment": "error",
@@ -123,7 +120,6 @@
         ],
         "@typescript-eslint/no-empty-function": "warn",
         "@typescript-eslint/no-empty-interface": "warn",
-        "@typescript-eslint/no-explicit-any": "warn",
         "@typescript-eslint/no-inferrable-types": [
           "warn",
           {
@@ -138,7 +134,7 @@
             "allowTernary": true
           }
         ],
-        "@typescript-eslint/no-var-requires": "error",
+        "@typescript-eslint/no-unused-vars": "off",
         "@typescript-eslint/prefer-optional-chain": "warn",
         "arrow-body-style": ["warn", "as-needed"],
         "arrow-parens": ["warn", "as-needed"],
@@ -358,11 +354,6 @@
               "filePattern": "^(?!.*/store/(sentry-config/sentry-config|seo/seo|core/messages/messages)\\.effects\\.ts$).*\\.effects\\.ts*$",
               "message": "The usage of \"tap\" in effects, if not related to 3rd party integrations, can usually be transformed properly into RxJS stream code."
             },
-            {
-              "name": "@typescript-eslint/experimental-utils",
-              "filePattern": ".*eslint-rules/.*",
-              "message": "Change to \"@typescript-eslint/utils\"."
-            },
             {
               "importNamePattern": "^DomService$",
               "name": "ish-core/utils/dom/dom.service",
@@ -403,7 +394,8 @@
         "ish-custom-rules/no-testbed-with-then": "error",
         "ish-custom-rules/no-var-before-return": "warn",
         "ish-custom-rules/ordered-imports": "warn",
-        "ish-custom-rules/private-destroy-field": "error",
+        "ish-custom-rules/private-destroy-field": "warn",
+        "ish-custom-rules/private-destroyRef-field": "error",
         "ish-custom-rules/project-structure": [
           "warn",
           {
@@ -828,8 +820,7 @@
         "rxjs-angular/prefer-takeuntil": [
           "error",
           {
-            "checkDestroy": true,
-            "checkComplete": true,
+            "alias": ["takeUntilDestroyed"],
             "checkDecorators": ["Component", "Pipe", "Directive"]
           }
         ],
@@ -858,7 +849,12 @@
         "rxjs/no-unsafe-catch": "error",
         "rxjs/no-unsafe-subject-next": "error",
         "rxjs/no-unsafe-switchmap": "error",
-        "rxjs/no-unsafe-takeuntil": "error",
+        "rxjs/no-unsafe-takeuntil": [
+          "error",
+          {
+            "alias": ["takeUntilDestroyed"]
+          }
+        ],
         "unicorn/no-null": [
           "warn",
           {
@@ -911,15 +907,13 @@
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@angular-eslint/template/recommended"],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended",
+        "plugin:@angular-eslint/template/accessibility"
+      ],
       "rules": {
-        "@angular-eslint/template/accessibility-alt-text": "error",
-        "@angular-eslint/template/accessibility-elements-content": "error",
-        "@angular-eslint/template/accessibility-label-for": "error",
-        "@angular-eslint/template/accessibility-valid-aria": "error",
-        "@angular-eslint/template/click-events-have-key-events": "error",
-        "@angular-eslint/template/mouse-events-have-key-events": "error",
-        "@angular-eslint/template/no-positive-tabindex": "error"
+        "@angular-eslint/template/no-positive-tabindex": "error",
+        "@angular-eslint/template/prefer-self-closing-tags": "error"
       }
     },
     {

diff --git a/.github/workflows/automated-upgrade.yml → .github/workflows/automated-update.yml b/.github/workflows/automated-upgrade.yml → .github/workflows/automated-update.yml
@@ -1,16 +1,16 @@
-name: AutomatedUpgrade
+name: AutomatedUpdate
 
 on:
   workflow_dispatch:
   pull_request:
     types: [opened, synchronize]
     paths:
-      - scripts/upgrade-pwa.js
+      - scripts/update-pwa.js
   schedule:
     - cron: '0 0 * * 1'
 
 env:
-  NODE_VERSION: 16.16.0
+  NODE_VERSION: 18.16.0
 
 jobs:
   CancelPrevious:
@@ -23,7 +23,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  AutomatedUpgrade:
+  AutomatedUpdate:
     needs: [CancelPrevious]
     runs-on: ubuntu-latest
     continue-on-error: true
@@ -45,25 +45,25 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: npm
 
-      - name: Create Upgrade Branch
+      - name: Create Update Branch
         run: |
           git config --global user.email "[email protected]"
           git config --global user.name "GitHub CI"
-          git switch -c upgrade/automated-upgrade
+          git switch -c update/automated-update
 
-      - name: Run Upgrade Script
-        run: node scripts/upgrade-pwa
+      - name: Run Update Script
+        run: node scripts/update-pwa
 
       - name: Run Automated Fixes
         run: |
           npm run lint -- --fix
           npm run format
           git add .
-          git commit -m "chore: post upgrade fixes" --allow-empty
+          git commit -m "chore: post update fixes" --allow-empty
 
       - name: Run Tests
         run: npm run test
 
-      - name: Push Upgrade Branch
+      - name: Push Update Branch
         if: always()
-        run: git push --force origin upgrade/automated-upgrade
+        run: git push --force origin update/automated-update
diff --git a/.github/workflows/demo-server-up.yml b/.github/workflows/demo-server-up.yml
@@ -11,7 +11,7 @@ on:
 #
 # 2. Change these variables for your configuration:
 env:
-  ICM_BASE_URL: http://pwa-review.northeurope.cloudapp.azure.com:8081
+  ICM_BASE_URL: https://review.icm.intershop.de
 
 jobs:
   CancelPrevious:

diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -14,7 +14,7 @@ on:
 
 env:
   NODE_VERSION: 18.16.0
-  ICM_BASE_URL: http://pwa-review.northeurope.cloudapp.azure.com:8081
+  ICM_BASE_URL: https://review.icm.intershop.de
 
 jobs:
   CancelPrevious:

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -14,8 +14,8 @@ on:
 
 env:
   NODE_VERSION: 18.16.0
-  NODE_OPTIONS: --max_old_space_size=8192
-  ICM_BASE_URL: http://pwa-review.northeurope.cloudapp.azure.com:8081
+  NODE_OPTIONS: --max_old_space_size=10240
+  ICM_BASE_URL: https://review.icm.intershop.de
 
 jobs:
   CancelPrevious:
@@ -141,7 +141,7 @@ jobs:
           node dist/$THEME/run-standalone &
 
       - name: Cypress
-        uses: cypress-io/github-action@v4
+        uses: cypress-io/github-action@v6
         with:
           install: false
           wait-on: 'http://localhost:4200'

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -68,7 +68,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: npm
 
-      - uses: 1arp/create-a-file-action@0.2
+      - uses: 1arp/create-a-file-action@0.3
         with:
           path: '.'
           file: 'script.bat'

diff --git a/.prettierignore b/.prettierignore
@@ -22,6 +22,7 @@
 *.properties
 *.crt
 *.key
+*.lua
 .*ignore
 .husky
 .gitattributes

diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -17,6 +17,7 @@
     "import-notation": "string",
     "media-feature-name-no-vendor-prefix": true,
     "media-feature-name-no-unknown": true,
+    "media-query-no-invalid": null,
     "no-descending-specificity": null,
     "no-duplicate-selectors": true,
     "property-no-vendor-prefix": true,

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -5,27 +5,20 @@
   "recommendations": [
     // synchronize-marker:vscode-extensions:begin
     // general
-    "eamodio.gitlens",
     "vscode-icons-team.vscode-icons",
-    "vincaslt.highlight-matching-tag",
     // code assist
     "visualstudioexptteam.vscodeintellicode",
     "angular.ng-template",
     "mikael.angular-beastcode",
-    "formulahendry.auto-rename-tag",
     // code style + formatting
     "editorconfig.editorconfig",
     "esbenp.prettier-vscode",
     "stylelint.vscode-stylelint",
-    "csstools.postcss",
     "dbaeumer.vscode-eslint",
     // testing
     "andys8.jest-snippets",
     // documentation
-    "streetsidesoftware.code-spell-checker",
-    "yzhang.markdown-all-in-one"
+    "streetsidesoftware.code-spell-checker"
     // synchronize-marker:vscode-extensions:end
-  ],
-  // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-  "unwantedRecommendations": ["eg2.tslint"]
+  ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ @@
     *.properties
     *.crt
     *.key
+    *.lua
     .*ignore
     .husky
     .gitattributes
@@ Expand Down @@