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

intershop · Jul 23, 2020 · 570701b · 570701b
2 parents e058a6f + 3e1d821
commit 570701b
Show file tree

Hide file tree

Showing 440 changed files with 13,575 additions and 6,433 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -0,0 +1,36 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
+Firefox ESR
+not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
+not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
+
+
+## previous PWA configuration:
+# > 0.5%
+# last 2 versions
+# Firefox ESR
+# not dead
+# IE 11
diff --git a/.github/workflows/demo-server-down.yml b/.github/workflows/demo-server-down.yml
@@ -0,0 +1,25 @@
+name: DemoServerDown
+
+on:
+  pull_request:
+    types: [closed]
+
+env:
+  GROUP: 'pwa-gh-review'
+  APP: 'pwa-gh-review-${{ github.event.pull_request.number }}'
+
+jobs:
+  RemoveDemoServer:
+    if: github.event.pull_request.head.repo.owner.login == 'intershop'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to Azure
+        run: |
+          az login -u ${{ secrets.AZURE_USERNAME }} -p=${{ secrets.AZURE_PASSWORD }}
+          az account set --subscription ${{ secrets.AZURE_SUBSCRIPTION }}
+
+      - name: Remove Universal B2C App
+        run: test -z "$(az webapp show -g $GROUP -n $APP-universal-b2c)" || az webapp delete -g $GROUP --name $APP-universal-b2c
+
+      - name: Remove Universal B2B App
+        run: test -z "$(az webapp show -g $GROUP -n $APP-universal-b2b)" || az webapp delete -g $GROUP --name $APP-universal-b2b
diff --git a/.github/workflows/demo-server.yml b/.github/workflows/demo-server.yml
@@ -0,0 +1,88 @@
+name: DemoServerUp
+
+on: [pull_request]
+
+env:
+  ICM_BASE_URL: http://pwa-review.northeurope.cloudapp.azure.com:8081
+  GROUP: 'pwa-gh-review'
+  APP: 'pwa-gh-review-${{ github.event.pull_request.number }}'
+
+jobs:
+  CancelPrevious:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Old Pipeline
+        uses: rokroskar/workflow-run-cleanup-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  BuildNDeployDemoServer:
+    if: github.event.pull_request.head.repo.owner.login == 'intershop'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
+      - name: Publish Universal Image to Registry
+        id: universal
+        uses: elgohr/Publish-Docker-Github-Action@master
+        env:
+          serviceWorker: false
+          configuration: local
+          displayVersion: '$GITHUB_SHA'
+        with:
+          name: universal
+          username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
+          password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+          registry: ${{ secrets.DOCKER_REGISTRY }}
+          buildargs: serviceWorker,configuration,displayVersion
+
+      # - name: Publish Nginx Image to Registry
+      #   id: nginx
+      #   uses: elgohr/Publish-Docker-Github-Action@master
+      #   with:
+      #     name: nginx
+      #     username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
+      #     password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+      #     registry: ${{ secrets.DOCKER_REGISTRY }}
+      #     workdir: nginx
+
+      - name: Set Environment
+        uses: allenevans/[email protected]
+        with:
+          overwrite: true
+          DOCKER_IMAGE_UNIVERSAL: ${{ steps.universal.outputs.digest }}
+          # DOCKER_IMAGE_NGINX: ${{ steps.nginx.outputs.digest }}
+
+      - name: Login to Azure
+        run: |
+          az login -u ${{ secrets.AZURE_USERNAME }} -p=${{ secrets.AZURE_PASSWORD }}
+          az account set --subscription ${{ secrets.AZURE_SUBSCRIPTION }}
+
+      - name: Create Resource Group
+        run: test "$(az group exists --name $GROUP)" = "true" || az group create --name $GROUP --location "North Europe"
+
+      - name: Create App Service Plan
+        run: test ! -z "$(az appservice plan show --name $GROUP-plan --resource-group $GROUP)" || az appservice plan create --name $GROUP-plan --resource-group $GROUP --sku B1 --is-linux
+
+      - name: Create or Update B2C App Service
+        run: |
+          az webapp config container set --resource-group $GROUP --name $APP-universal-b2c --docker-registry-server-user ${{ secrets.DOCKER_REGISTRY_USERNAME }} --docker-registry-server-password ${{ secrets.DOCKER_REGISTRY_PASSWORD }} --docker-custom-image-name $DOCKER_IMAGE_UNIVERSAL || az webapp create --resource-group $GROUP --plan $GROUP-plan --name $APP-universal-b2c --docker-registry-server-user ${{ secrets.DOCKER_REGISTRY_USERNAME }} --docker-registry-server-password ${{ secrets.DOCKER_REGISTRY_PASSWORD }} --deployment-container-image-name $DOCKER_IMAGE_UNIVERSAL
+          az webapp config appsettings set -g $GROUP -n $APP-universal-b2c --settings LOGGING=true ICM_BASE_URL=$ICM_BASE_URL
+          az webapp deployment container config -g $GROUP -n $APP-universal-b2c --enable-cd true
+          echo "B2C channel: http://$APP-universal-b2c.azurewebsites.net"
+
+      - name: Create or Update B2B App Service
+        run: |
+          az webapp config container set --resource-group $GROUP --name $APP-universal-b2b --docker-registry-server-user ${{ secrets.DOCKER_REGISTRY_USERNAME }} --docker-registry-server-password ${{ secrets.DOCKER_REGISTRY_PASSWORD }} --docker-custom-image-name $DOCKER_IMAGE_UNIVERSAL || az webapp create --resource-group $GROUP --plan $GROUP-plan --name $APP-universal-b2b --docker-registry-server-user ${{ secrets.DOCKER_REGISTRY_USERNAME }} --docker-registry-server-password ${{ secrets.DOCKER_REGISTRY_PASSWORD }} --deployment-container-image-name $DOCKER_IMAGE_UNIVERSAL
+          az webapp config appsettings set -g $GROUP -n $APP-universal-b2b --settings LOGGING=true ICM_BASE_URL=$ICM_BASE_URL ICM_CHANNEL=inSPIRED-inTRONICS_Business-Site THEME=blue\|688dc3 FEATURES=compare,recently,tracking,sentry,advancedVariationHandling,businessCustomerRegistration,quoting,quickorder,orderTemplates
+          az webapp deployment container config -g $GROUP -n $APP-universal-b2b --enable-cd true
+          echo "B2B channel: http://$APP-universal-b2b.azurewebsites.net"
+
+      - name: Create Commit Comment
+        uses: peter-evans/commit-comment@v1
+        with:
+          body: |
+            Azure Demo Servers are available:
+            - [Universal B2C](http://${{ env.APP }}-universal-b2c.azurewebsites.net)
+            - [Universal B2B](http://${{ env.APP }}-universal-b2b.azurewebsites.net)
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -0,0 +1,47 @@
+name: Docs
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+    types: [opened, synchronize]
+    paths:
+      - '**.md'
+      - 'docs/**'
+
+jobs:
+  Docs:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Use Node.js 12
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+
+      - name: Install root dependencies
+        uses: bahmutov/npm-install@v1
+
+      - name: Check KB Labels
+        run: node docs/check-kb-labels
+
+      - name: Check Documentation Overview
+        run: node docs/check-documentation-overview
+
+      - name: Check Newline After Every Sentence
+        run: node docs/check-sentence-newline
+
+      - name: Check Formatting
+        run: |
+          npx prettier --write docs/**/*.*
+          bash ./scripts/ci-test-no-changes.sh 'you probably committed unformatted documentation'
+
+      - name: Check Dead Links For All Files
+        if: github.ref == 'refs/heads/develop'
+        run: node docs/check-dead-links
+
+      - name: Check Dead Links For Changed Files
+        if: github.ref != 'refs/heads/develop'
+        run: node docs/check-dead-links origin/develop
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,6 +1,17 @@
 name: TestCI
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+    types: [opened, synchronize]
+    paths-ignore:
+      - 'docs/**'
+
+env:
+  ICM_BASE_URL: http://pwa-review.northeurope.cloudapp.azure.com:8081
 
 jobs:
   CancelPrevious:
@@ -107,51 +118,6 @@ jobs:
           name: dist
           path: dist
 
-  Docs:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: Use Node.js 12
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12
-
-      - name: Install root dependencies
-        uses: bahmutov/npm-install@v1
-
-      - name: Check KB Labels
-        run: node docs/check-kb-labels
-
-      - name: Check Documentation Overview
-        run: node docs/check-documentation-overview
-
-      - name: Check Newline After Every Sentence
-        run: node docs/check-sentence-newline
-
-      - name: Check Formatting
-        run: |
-          npx prettier --write docs/**/*.*
-          bash ./scripts/ci-test-no-changes.sh 'you probably committed unformatted documentation'
-
-      - name: Check Dead Links For All Files
-        if: github.ref == 'refs/heads/develop'
-        run: node docs/check-dead-links
-
-      - name: Check Dead Links For Changed Files
-        if: github.ref != 'refs/heads/develop'
-        run: node docs/check-dead-links origin/develop
-
-  Docker:
-    needs: [Build]
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v1
-
-      - name: Build PWA Docker Image
-        run: docker build .
-
   Universal:
     needs: [Build]
     runs-on: ubuntu-latest
@@ -178,7 +144,6 @@ jobs:
           overwrite: true
           LOGGING: true
           PROXY_ICM: true
-          ICM_BASE_URL: ${{ secrets.ICM_BASE_URL }}
 
       - name: Set B2B Environment
         if: matrix.test == 'b2b'
@@ -231,7 +196,6 @@ jobs:
           PWA_BASE_URL: http://localhost:4200
           LOGGING: true
           PROXY_ICM: true
-          ICM_BASE_URL: ${{ secrets.ICM_BASE_URL }}
           BROWSER: chrome
 
       - name: Set B2B Environment

diff --git a/.github/workflows/updates.yml b/.github/workflows/updates.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - develop
+      - upgrade/**
   schedule:
     - cron: '0 0 * * *'
 
@@ -53,3 +54,7 @@ jobs:
         run: |
           npm --prefix e2e outdated --long || true
           npm --prefix e2e audit || true
+
+      - name: browserslist
+        if: always()
+        run: npx browserslist || true
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -3,10 +3,7 @@ name: Windows
 on:
   push:
     branches:
-      - develop
-      - 'chore/**'
-      - 'refactor/**'
-      - 'build/**'
+      - '**'
 
 jobs:
   CancelPrevious:

diff --git a/.gitlab-ci-cancel-old-pipelines.sh b/.gitlab-ci-cancel-old-pipelines.sh
diff --git a/.gitlab-ci-check-mr-title.sh b/.gitlab-ci-check-mr-title.sh