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

intershop · Aug 4, 2021 · 93b4e15 · 93b4e15
2 parents 1f5f8be + 37de6de
commit 93b4e15
Show file tree

Hide file tree

Showing 605 changed files with 22,653 additions and 16,191 deletions.
diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml
@@ -0,0 +1,79 @@
+trigger:
+  - develop
+  - master
+  - 'refs/tags/release-*'
+
+pool:
+  vmImage: 'ubuntu-latest'
+
+variables:
+  - name: registryServerName
+    value: $(registryName).azurecr.io
+  - group: acr_ishpwa
+
+stages:
+  - stage: init
+    displayName: 'Prepare variables'
+    jobs:
+      - job: tag
+        displayName: 'set tag variable'
+        steps:
+          - bash: |
+              echo -n "##vso[task.setvariable variable=tag;isOutput=true]"
+              if [[ $(Build.SourceBranch) =~ tags/(.*) ]]
+              then
+                echo ${BASH_REMATCH[1]}
+              else
+                echo $(build.buildId)
+              fi
+            name: setvarStep
+      - job: imageName
+        displayName: 'set imageBaseName variable'
+        steps:
+          - bash: |
+              echo -n "##vso[task.setvariable variable=imageName;isOutput=true]"
+              if [[ $(Build.SourceBranch) =~ tags/(.*) ]]
+              then
+                printf '%.5s-%.18s\n' $(echo $(System.CollectionUri) | sed -e 's/^https:\/\/dev.azure.com\/ish-//') $(System.TeamProject)
+              else
+                printf '%.5s-%.9s-%.8s\n' $(echo $(System.CollectionUri) | sed -e 's/^https:\/\/dev.azure.com\/ish-//') $(System.TeamProject) $(Build.SourceBranchName)
+              fi
+            name: setvarStep2
+
+  - stage: ssr
+    displayName: 'Build the SSR container'
+    dependsOn: init
+    jobs:
+      - job: build_ssr
+        displayName: 'docker build ssr'
+        variables:
+          - name: tag
+            value: $[ stageDependencies.init.tag.outputs['setvarStep.tag'] ]
+          - name: imageBaseName
+            value: $[ stageDependencies.init.imageName.outputs['setvarStep2.imageName'] ]
+          - name: imageName
+            value: $(imageBaseName)-ssr
+        steps:
+          - bash: |
+              docker build -f $(system.defaultWorkingDirectory)/Dockerfile -t $(registryServerName)/$(imageName):$(tag) $(system.defaultWorkingDirectory) --build-arg displayVersion=$(tag)
+              docker login $(registryServerName) -u $(registryLogin) -p $(registryPassword)
+              docker push $(registryServerName)/$(imageName):$(tag)
+
+  - stage: nginx
+    displayName: 'Build the nginx container'
+    dependsOn: init
+    jobs:
+      - job: build_nginx
+        displayName: 'docker build nginx'
+        variables:
+          - name: tag
+            value: $[ stageDependencies.init.tag.outputs['setvarStep.tag'] ]
+          - name: imageBaseName
+            value: $[ stageDependencies.init.imageName.outputs['setvarStep2.imageName'] ]
+          - name: imageName
+            value: $(imageBaseName)-nginx
+        steps:
+          - bash: |
+              docker build -f $(system.defaultWorkingDirectory)/nginx/Dockerfile -t $(registryServerName)/$(imageName):$(tag) $(system.defaultWorkingDirectory)/nginx
+              docker login $(registryServerName) -u $(registryLogin) -p $(registryPassword)
+              docker push $(registryServerName)/$(imageName):$(tag)
diff --git a/.cspell.json b/.cspell.json
@@ -4,7 +4,7 @@
     "node_modules/**",
     "**/*.spec.ts",
     "docs/compodoc/**",
-    "environment.local.ts"
+    "environment.development.ts"
   ],
   "ignoreRegExpList": [
     "/\\b[\\w-]+(\\.[\\w-]+)+\\b/",

diff --git a/.cz-config.js b/.cz-config.js
@@ -9,8 +9,7 @@ module.exports = {
     { value: 'docs', name: 'docs:     Documentation changes (-> changelog)' },
     {
       value: 'style',
-      name:
-        'style:    Changes that do not affect the meaning of the code\n            (white-space, formatting, missing semi-colons, etc)',
+      name: 'style:    Changes that do not affect the meaning of the code\n            (white-space, formatting, missing semi-colons, etc)',
     },
     { value: 'i18n', name: 'i18n:     Localization changes' },
     {

diff --git a/.dockerignore b/.dockerignore
@@ -1,15 +1,30 @@
 .gradle
 build
-cypress
+
+e2e
 nginx
+
 node_modules
-templates
 .dockerignore
+Dockerfile*
 .git
 .gitattributes
 .gitignore
-.gitlab-ci.yml
-Dockerfile*
+
 templates
 !templates/webpack
 !templates/nginx.conf
+
+# synchronize-marker:dist-scripts:begin
+/dist
+!/dist/build-ecosystem.js
+!/dist/entrypoint.sh
+!/dist/healthcheck.js
+!/dist/prometheus.js
+!/dist/robots.txt
+!/dist/server.crt
+!/dist/server.js
+!/dist/server.key
+!/dist/readinessprobe.js
+!/dist/livenessprobe.js
+# synchronize-marker:dist-scripts:end
diff --git a/.editorconfig b/.editorconfig
@@ -1,4 +1,4 @@
-# Editor configuration, see http://editorconfig.org
+# Editor configuration, see https://editorconfig.org
 root = true
 
 [*]

diff --git a/.github/workflows/azure-devops-issue-sync.yml b/.github/workflows/azure-devops-issue-sync.yml
@@ -0,0 +1,26 @@
+# https://github.com/marketplace/actions/github-issues-to-azure-devops
+
+name: Sync Issue to Azure DevOps
+
+on:
+  issues:
+    types: [opened, edited, deleted, closed, reopened, labeled, unlabeled, assigned]
+
+jobs:
+  alert:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: danhellem/github-actions-issue-to-work-item@master
+        env:
+          ado_token: '${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}'
+          github_token: '${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}'
+          ado_organization: 'intershop-com'
+          ado_project: 'Products'
+          ado_area_path: "Products\\Intershop 7"
+          ado_iteration_path: "Products\\PWA Rngrx"
+          ado_wit: 'Issue'
+          ado_new_state: 'New'
+          ado_active_state: 'Active'
+          ado_close_state: 'Closed'
+          ado_bypassrules: false
+          log_level: 100
diff --git a/.github/workflows/azure-devops-pr-sync.yml b/.github/workflows/azure-devops-pr-sync.yml
@@ -0,0 +1,27 @@
+# https://github.com/marketplace/actions/sync-pull-requests-to-azure-boards
+
+name: Sync Pull Request to Azure DevOps
+
+on:
+  pull_request:
+    types: [opened, edited, closed]
+    branches:
+      - 'develop'
+
+jobs:
+  alert:
+    if: github.event.pull_request.head.repo.owner.login == 'intershop'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: danhellem/github-actions-pr-to-work-item@master
+        env:
+          ado_token: '${{ secrets.ADO_PERSONAL_ACCESS_TOKEN }}'
+          github_token: '${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}'
+          ado_organization: 'intershop-com'
+          ado_project: 'Products'
+          ado_area_path: "Products\\Intershop 7"
+          ado_iteration_path: "Products\\PWA Rngrx"
+          ado_wit: 'Issue'
+          ado_new_state: 'New'
+          ado_active_state: 'Active'
+          ado_close_state: 'Closed'
diff --git a/.github/workflows/azure-devops.yml b/.github/workflows/azure-devops.yml
@@ -24,7 +24,7 @@ jobs:
         uses: Azure/pipelines@v1
         with:
           # Fullyqualified URL to the Azure DevOps organization along with project name(eg, https://dev.azure.com/organization/project-name or https://server.example.com:8080/tfs/DefaultCollection/project-name)
-          azure-devops-project-url: https://dev.azure.com/ish-pwa-rngrx/intershop-pwa
+          azure-devops-project-url: https://dev.azure.com/ish-rngrx/intershop-pwa
           # Name of the Azure Pipline to be triggered
           azure-pipeline-name: Sync
           # Paste personal access token of the user as value of secret variable:AZURE_DEVOPS_TOKEN

diff --git a/.github/workflows/dead-code.yml b/.github/workflows/dead-code.yml
@@ -16,9 +16,10 @@ jobs:
           fetch-depth: 0
 
       - name: Use Node.js 14
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: 14
+          cache: npm
 
       - name: Install root dependencies
         run: npm ci

diff --git a/.github/workflows/demo-server.yml b/.github/workflows/demo-server.yml
@@ -33,9 +33,9 @@ jobs:
         uses: elgohr/Publish-Docker-Github-Action@master
         env:
           serviceWorker: false
-          configuration: production
           displayVersion: ${{ github.event.after }}
           testing: true
+          NODE_OPTIONS: --max_old_space_size=8192
         with:
           name: universal
           username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
@@ -67,7 +67,7 @@ jobs:
           GROUP: ${{ secrets.AZURE_DEMO_RESOURCEGROUP }}
         run: |
           az webapp config container set --resource-group $GROUP --name $APP --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 ${{ secrets.AZURE_DEMO_APPSERVICEPLAN }} --name $APP --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 --settings LOGGING=true ICM_BASE_URL=$ICM_BASE_URL
+          az webapp config appsettings set -g $GROUP -n $APP --settings LOGGING=true ICM_BASE_URL=$ICM_BASE_URL THEME=default
           az webapp deployment container config -g $GROUP -n $APP --enable-cd true
           echo "B2C channel: http://$APP.azurewebsites.net"
 
@@ -77,7 +77,7 @@ jobs:
           GROUP: ${{ secrets.AZURE_DEMO_RESOURCEGROUP }}
         run: |
           az webapp config container set --resource-group $GROUP --name $APP --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 ${{ secrets.AZURE_DEMO_APPSERVICEPLAN }} --name $APP --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 --settings LOGGING=true ICM_BASE_URL=$ICM_BASE_URL ICM_CHANNEL=inSPIRED-inTRONICS_Business-Site THEME=blue\|688dc3 FEATURES=compare,recently,advancedVariationHandling,businessCustomerRegistration,quoting,quickorder,punchout,orderTemplates TACTON='${{ secrets.TACTON }}'
+          az webapp config appsettings set -g $GROUP -n $APP --settings LOGGING=true ICM_BASE_URL=$ICM_BASE_URL THEME=blue TACTON='${{ secrets.TACTON }}'
           az webapp deployment container config -g $GROUP -n $APP --enable-cd true
           echo "B2B channel: http://$APP.azurewebsites.net"
 

diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -33,9 +33,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: 14
+          cache: npm
 
       - name: Install root dependencies
         run: npm ci
@@ -52,7 +53,9 @@ jobs:
         run: git diff --exit-code --raw -p --stat
 
       - name: Compile Angular
-        run: npm run ng -- build --aot
+        run: npm run build client
+        env:
+          NODE_OPTIONS: --max_old_space_size=8192
 
       - name: Compile Unit Tests
         run: npx tsc -p tsconfig.all.json
@@ -75,9 +78,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: 14
+          cache: npm
 
       - name: Install root dependencies
         run: npm ci
@@ -102,9 +106,10 @@ jobs:
           fetch-depth: 0
 
       - name: Use Node.js 14
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: 14
+          cache: npm
 
       - name: Install root dependencies
         run: npm ci
@@ -121,19 +126,25 @@ jobs:
     needs: [Quality, Jest]
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        test: ['normal', 'customization']
+
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 14
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: 14
+          cache: npm
 
       - name: Install root dependencies
         run: npm ci
 
       - name: Test Schematics
         run: |
-          bash e2e/test-schematics.sh
+          bash e2e/test-schematics-${{ matrix.test }}.sh
           node scripts/tslint-hard
           npm run lint
 
@@ -145,7 +156,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Production Build PWA Image
-        run: docker-compose build --build-arg configuration=production pwa
+        run: docker-compose build pwa
 
   Nginx:
     needs: [Quality, Jest]

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -20,9 +20,10 @@ jobs:
           fetch-depth: 0
 
       - name: Use Node.js 14
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: 14
+          cache: npm
 
       - name: Install root dependencies
         run: npm ci