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

.devcontainer/Dockerfile

@@ -1,5 +1,5 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/javascript-node/.devcontainer/base.Dockerfile
-ARG VARIANT="16"
+ARG VARIANT="18"
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 
 ENV NODE_OPTIONS=--max_old_space_size=8192 LOGGING=true TRUST_ICM=true

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
   "build": {
     "dockerfile": "Dockerfile",
     "args": {
-      "VARIANT": "16"
+      "VARIANT": "18"
     }
   },
   // node_modules as volume

.dockerignore

@@ -43,7 +43,6 @@
 # from e2e/.gitignore
 /e2e/node_modules
 /e2e/reports
-/e2e/package-lock.json
 
 # from eslint-rules/.gitignore
 /eslint-rules/node_modules
@@ -97,6 +96,9 @@
 # from src/app/extensions/order-templates/exports/.gitignore
 /src/app/extensions/order-templates/exports/**/lazy*
 
+# from src/app/extensions/product-notifications/exports/.gitignore
+/src/app/extensions/product-notifications/exports/**/lazy*
+
 # from src/app/extensions/punchout/exports/.gitignore
 /src/app/extensions/punchout/exports/**/lazy*
 

.eslintignore

@@ -13,4 +13,3 @@ node_modules
 /eslint-rules/dist/**
 
 /schematics/dist/**
-/schematics/migration/**

.eslintrc.json

@@ -182,14 +182,7 @@
         "dot-notation": "off", // disabled in favor of @typescript-eslint/dot-notation
         "eqeqeq": ["error", "always"],
         "etc/no-commented-out-code": "warn",
-        "etc/no-deprecated": [
-          "warn",
-          {
-            "ignored": {
-              "templateOptions|to|FormlyTemplateOptions|expressionProperties": "name" // deprecated formly methods are temporarily ignored
-            }
-          }
-        ],
+        "etc/no-deprecated": ["warn"],
         "id-blacklist": [
           "error",
           "any",
@@ -277,7 +270,7 @@
             {
               "importNamePattern": ".*",
               "name": ".*environments/environment.*",
-              "filePattern": "^.*/app/((?!(app(.server)?.module|core/store/core/configuration/configuration\\.reducer|core/utils/state-transfer/state-properties\\.service|injection-keys)\\.ts).)*$",
+              "filePattern": "^.*/app/((?!(app(.server)?.module|core/store/core/configuration/configuration\\.reducer|core/utils/state-transfer/state-properties\\.service|core/utils/injection)\\.ts).)*$",
               "message": "Importing environment is not allowed. Inject needed properties instead."
             },
             {
@@ -682,6 +675,7 @@
         "ish-custom-rules/use-correct-component-overrides": "warn",
         "ish-custom-rules/use-jest-extended-matchers-in-tests": "warn",
         "ish-custom-rules/use-ssr-variable-instead-of-platform-id": "warn",
+        "ish-custom-rules/use-type-safe-injection-token": "warn",
         "ish-custom-rules/require-formly-code-documentation": "warn",
         "jest/no-commented-out-tests": "warn",
         "jest/no-disabled-tests": "warn",

.github/workflows/dead-code.yml

@@ -7,7 +7,7 @@ on:
     - cron: '0 0 * * 0'
 
 env:
-  NODE_VERSION: 16.16.0
+  NODE_VERSION: 18.15.0
 
 jobs:
   TestBed:
@@ -18,7 +18,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}

.github/workflows/demo-server-up.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v3
       - name: Publish SSR image to Registry
         id: ssr
-        uses: elgohr/Publish-Docker-Github-Action@v4
+        uses: elgohr/Publish-Docker-Github-Action@v5
         env:
           serviceWorker: false
           displayVersion: ${{ github.event.after }}
@@ -45,7 +45,7 @@ jobs:
           buildargs: serviceWorker,displayVersion,testing
       - name: Publish NGINX image to Registry
         id: nginx
-        uses: elgohr/Publish-Docker-Github-Action@v4
+        uses: elgohr/Publish-Docker-Github-Action@v5
         with:
           name: intershop-pwa-nginx
           username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}

.github/workflows/development.yml

@@ -13,7 +13,7 @@ on:
       - 'docs/**'
 
 env:
-  NODE_VERSION: 16.16.0
+  NODE_VERSION: 18.15.0
   ICM_BASE_URL: http://pwa-review.northeurope.cloudapp.azure.com:8081
 
 jobs:
@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -80,7 +80,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -110,7 +110,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -138,7 +138,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}

.github/workflows/docs.yml

@@ -8,7 +8,7 @@ on:
     types: [opened, synchronize]
 
 env:
-  NODE_VERSION: 16.16.0
+  NODE_VERSION: 18.15.0
 
 jobs:
   Docs:
@@ -19,7 +19,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}

.github/workflows/integration.yml

@@ -13,7 +13,7 @@ on:
       - 'docs/**'
 
 env:
-  NODE_VERSION: 16.16.0
+  NODE_VERSION: 18.15.0
   NODE_OPTIONS: --max_old_space_size=8192
   ICM_BASE_URL: http://pwa-review.northeurope.cloudapp.azure.com:8081
 
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -67,7 +67,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}

.github/workflows/reports.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: Publish Reports Image to Registry
         id: reports
-        uses: elgohr/Publish-Docker-Github-Action@master
+        uses: elgohr/Publish-Docker-Github-Action@v5
         with:
           name: reports
           username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}

.github/workflows/updates.yml

@@ -10,7 +10,7 @@ on:
     - cron: '0 0 * * *'
 
 env:
-  NODE_VERSION: 16.16.0
+  NODE_VERSION: 18.15.0
 
 jobs:
   Updates:
@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}

.github/workflows/windows.yml

@@ -9,7 +9,7 @@ on:
       - 'docs/**'
 
 env:
-  NODE_VERSION: 16.16.0
+  NODE_VERSION: 18.15.0
   NODE_OPTIONS: --max_old_space_size=8192
   JEST_MAX_WORKERS: 1
   CI: false
@@ -42,7 +42,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -62,7 +62,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -92,7 +92,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}
@@ -108,7 +108,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 16
+      - name: Use Node.js 18
         uses: actions/setup-node@v3
         with:
           node-version: ${{ env.NODE_VERSION }}