chore: release 1.0.0-rc.7

.eslintrc.js

@@ -12,10 +12,11 @@ module.exports = {
   parserOptions: {
     parser: '@typescript-eslint/parser',
     project: [
-      resolve(__dirname, './tsconfig.base.json'),
+      resolve(__dirname, './tsconfig.json'),
       resolve(__dirname, './packages/api-client/tsconfig.json'),
       resolve(__dirname, './packages/composables/tsconfig.json'),
-      resolve(__dirname, './packages/theme/tsconfig.json')
+      resolve(__dirname, './packages/theme/tsconfig.json'),
+      resolve(__dirname, './packages/theme/tests/e2e/tsconfig.json'),
     ],
     tsconfigRootDir: __dirname,
     extraFileExtensions: ['.vue'],
@@ -30,6 +31,14 @@ module.exports = {
     '@vue-storefront/eslint-config-jest',
   ],
   rules: {
-    "@typescript-eslint/no-floating-promises": "off"
+    "@typescript-eslint/no-floating-promises": "off",
+    "jest/expect-expect": [
+      "error",
+      {
+        "assertFunctionNames": ["expect", "getByRole", "getByTestId"],
+      }
+    ],
+    "no-plusplus": "off",
   }
 }
+

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Frodigo @bartoszherba @sethidden

.github/workflows/assing-pr-to-author.yml

@@ -3,6 +3,10 @@ on:
   pull_request:
     types: [opened, ready_for_review, edited, synchronize]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   assignAuthor:
     name: Assing

.github/workflows/conventional-pr-name.yml

@@ -3,6 +3,10 @@ on:
   pull_request:
     types: ['opened', 'edited', 'reopened', 'synchronize']
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     name: Validate PR Title (conventional-commit)

.github/workflows/deploy-vue-storefront-cloud.yml

@@ -4,6 +4,7 @@ on:
     branches:
       - main
       - develop
+      - enterprise
       - release/*
 
 jobs:
@@ -25,108 +26,93 @@ jobs:
           password: ${{ secrets.CLOUD_PASSWORD }}
           dockerfile: .vuestorefrontcloud/docker/Dockerfile
           buildoptions: --compress
-          buildargs: NPM_EMAIL,NPM_PASS,NPM_USER,NPM_REGISTRY,STORE_URL,MAGENTO_GRAPHQL,MAGENTO_EXTERNAL_CHECKOUT,MAGENTO_EXTERNAL_CHECKOUT_URL,MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH,IMAGE_PROVIDER,IMAGE_PROVIDER_BASE_URL,REDIS__HOST,REDIS__PORT,REDIS__CACHE_INVALIDATE_KEY,REDIS__CACHE_INVALIDATE_URL,REDIS__KEY_PREFIX,REDIS__ENABLED,SENTRY_DSN,RECAPTCHA_SITE_KEY,RECAPTCHA_SECRET_KEY
+          buildargs: NPM_EMAIL,NPM_PASS,NPM_USER,NPM_REGISTRY,LAST_COMMIT,VSF_STORE_URL,VSF_MAGENTO_BASE_URL,VSF_MAGENTO_GRAPHQL_URL,VSF_MAGENTO_EXTERNAL_CHECKOUT_ENABLED,VSF_MAGENTO_EXTERNAL_CHECKOUT_URL,VSF_MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH,VSF_IMAGE_PROVIDER,VSF_IMAGE_PROVIDER_BASE_URL,VSF_IMAGE_PROVIDER_DOMAIN,VSF_REDIS_HOST,VSF_REDIS_PORT,VSF_REDIS_CACHE_INVALIDATE_KEY,VSF_REDIS_CACHE_INVALIDATE_URL,VSF_REDIS_KEY_PREFIX,VSF_REDIS_ENABLED,VSF_RECAPTCHA_ENABLED,VSF_RECAPTCHA_HIDE_BADGE,VSF_RECAPTCHA_VERSION,VSF_RECAPTCHA_SIZE,VSF_RECAPTCHA_MIN_SCORE,VSF_RECAPTCHA_SITE_KEY,VSF_RECAPTCHA_SECRET_KEY,VSF_SENTRY_DSN,
+
         env:
           NPM_EMAIL: ${{ secrets.NPM_EMAIL }}
-          NPM_PASS: ${{ secrets.CLOUD_PASSWORD }}
           NPM_USER: ${{ secrets.CLOUD_USERNAME }}
+          NPM_PASS: ${{ secrets.CLOUD_PASSWORD }}
           NPM_REGISTRY: https://registrynpm.storefrontcloud.io
-          STORE_URL: ${{ secrets.STORE_URL }}
-          MAGENTO_GRAPHQL: ${{ secrets.MAGENTO_GRAPHQL }}
-          MAGENTO_EXTERNAL_CHECKOUT: false
-          MAGENTO_EXTERNAL_CHECKOUT_URL: ${{ secrets.MAGENTO_EXTERNAL_CHECKOUT_URL }}
-          MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH: ${{ secrets.MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH }}
-          IMAGE_PROVIDER: ${{ secrets.IMAGE_PROVIDER }}
-          IMAGE_PROVIDER_BASE_URL: ${{ secrets.IMAGE_PROVIDER_BASE_URL }}
-          REDIS__HOST: ${{ secrets.REDIS__HOST }}
-          REDIS__PORT: ${{ secrets.REDIS__PORT }}
-          REDIS__KEY_PREFIX: ${{ secrets.REDIS__KEY_PREFIX }}
-          REDIS__CACHE_INVALIDATE_KEY: ${{ secrets.REDIS__CACHE_INVALIDATE_KEY }}
-          REDIS__CACHE_INVALIDATE_URL: ${{ secrets.REDIS__CACHE_INVALIDATE_URL }}
-          REDIS__ENABLED: ${{ secrets.REDIS__ENABLED }}
-          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-          RECAPTCHA_SITE_KEY: ${{ secrets.RECAPTCHA_SITE_KEY }}
-          RECAPTCHA_SECRET_KEY: ${{ secrets.RECAPTCHA_SECRET_KEY }}
-  deploy:
-    runs-on: ubuntu-latest
+
+          VSF_STORE_URL: '' # TODO
+
+          VSF_MAGENTO_BASE_URL: https://magento2-instance.vuestorefront.io/
+          VSF_MAGENTO_GRAPHQL_URL: https://magento2-instance.vuestorefront.io/graphql
+          VSF_MAGENTO_EXTERNAL_CHECKOUT_ENABLED: false
+          VSF_MAGENTO_EXTERNAL_CHECKOUT_URL: ''
+          VSF_MAGENTO_EXTERNAL_CHECKOUT_SYNC_PATH: ''
+
+          VSF_IMAGE_PROVIDER: cloudinary
+          VSF_IMAGE_PROVIDER_BASE_URL: https://res-4.cloudinary.com/dnozky7on/image/upload/
+          VSF_IMAGE_PROVIDER_DOMAIN: https://res-4.cloudinary.com
+
+          VSF_REDIS_ENABLED: true
+          VSF_REDIS_HOST: redis # VSF cloud specific
+          VSF_REDIS_PORT: 6379
+          VSF_REDIS_KEY_PREFIX: ${{ github.sha }}
+          VSF_REDIS_CACHE_INVALIDATE_KEY: magento2vsf2
+          VSF_REDIS_CACHE_INVALIDATE_URL: /cache-invalidate
+
+          VSF_RECAPTCHA_ENABLED: false
+          VSF_RECAPTCHA_HIDE_BADGE: false
+          VSF_RECAPTCHA_VERSION: 3
+          VSF_RECAPTCHA_SIZE: invisible
+          VSF_RECAPTCHA_MIN_SCORE: 0.5
+          VSF_RECAPTCHA_SITE_KEY: 6Ldce0EeAAAAAAGGtGWG-e-SygXiFub6PXHT5fKd
+          VSF_RECAPTCHA_SECRET_KEY: ${{ secrets.RECAPTCHA_SECRET_KEY }}
+
+          VSF_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+
+          LAST_COMMIT: ${{ github.sha  }}
+
+  deploy-main:
+    uses: ./.github/workflows/deployment-template.yml
     needs: build
-    steps:
-      - uses: chrnorm/deployment-action@releases/v1
-        name: Create GitHub deployment
-        id: deployment
-        with:
-          token: ${{ github.token }}
-          target_url: https://demo-magento2.europe-west1.gcp.storefrontcloud.io
-          environment: production
-          initial_status: in_progress
-      - name: Deploy on demo-magento2.europe-west1.gcp.storefrontcloud.io
-        if: startsWith(github.ref, 'refs/heads/main')
-        run: |
-          if curl -s -H 'X-User-Id: ${{ secrets.CLOUD_USERNAME }}'  -H 'X-Api-Key: ${{ secrets.CLOUD_PASSWORD }}' -H 'Content-Type: application/json' -X POST -d '{
-              "code":"demo-magento2",
-              "region":"europe-west1.gcp",
-              "frontContainerVersion":"${{ github.sha }}"
-            }' https://farmer.storefrontcloud.io/instances | grep -q '{"code":200,"result":"Instance updated!"}'; then
-            echo "Instance updated"
-          else
-            echo "Something went wrong during the update process..."
-            exit 1
-          fi
-      - name: Deploy on demo-magento2-dev.europe-west1.gcp.storefrontcloud.io/
-        if: startsWith(github.ref, 'refs/heads/develop')
-        run: |
-          if curl -s -H 'X-User-Id: ${{ secrets.CLOUD_USERNAME }}'  -H 'X-Api-Key: ${{ secrets.CLOUD_PASSWORD }}' -H 'Content-Type: application/json' -X POST -d '{
-              "code":"demo-magento2-dev",
-              "region":"europe-west1.gcp",
-              "frontContainerVersion":"${{ github.sha }}"
-            }' https://farmer.storefrontcloud.io/instances | grep -q '{"code":200,"result":"Instance updated!"}'; then
-            echo "Instance updated"
-          else
-            echo "Something went wrong during the update process..."
-            exit 1
-          fi
-      - name: Deploy on demo-magento2-canary.europe-west1.gcp.storefrontcloud.io
-        if: startsWith(github.ref, 'refs/heads/release')
-        run: |
-          if curl -s -H 'X-User-Id: ${{ secrets.CLOUD_USERNAME }}'  -H 'X-Api-Key: ${{ secrets.CLOUD_PASSWORD }}' -H 'Content-Type: application/json' -X POST -d '{
-              "code":"demo-magento2-canary",
-              "region":"europe-west1.gcp",
-              "frontContainerVersion":"${{ github.sha }}"
-            }' https://farmer.storefrontcloud.io/instances | grep -q '{"code":200,"result":"Instance updated!"}'; then
-            echo "Instance updated"
-          else
-            echo "Something went wrong during the update process..."
-            exit 1
-          fi
-      - name: Deploy on demo-magento2-enterprise.europe-west1.gcp.storefrontcloud.io
-        if: startsWith(github.ref, 'refs/heads/enterprise')
-        run: |
-          if curl -s -H 'X-User-Id: ${{ secrets.CLOUD_USERNAME }}'  -H 'X-Api-Key: ${{ secrets.CLOUD_PASSWORD }}' -H 'Content-Type: application/json' -X POST -d '{
-              "code":"demo-magento2-enterprise",
-              "region":"europe-west1.gcp",
-              "frontContainerVersion":"${{ github.sha }}"
-            }' https://farmer.storefrontcloud.io/instances | grep -q '{"code":200,"result":"Instance updated!"}'; then
-            echo "Instance updated"
-          else
-            echo "Something went wrong during the update process..."
-            exit 1
-          fi
+    if: github.ref == 'refs/heads/main'
+    with:
+      github_environment_name: production
+      environment_code: demo-magento2
+      target_url: https://demo-magento2.europe-west1.gcp.storefrontcloud.io
+    secrets:
+      cloud_username: ${{ secrets.CLOUD_USERNAME }}
+      cloud_password: ${{ secrets.CLOUD_PASSWORD }}
+      deployment_status_token: ${{ secrets.DEPLOYMENT_PERSONAL_ACCESS_TOKEN }}
 
-      - name: Update deployment status (success)
-        if: success()
-        uses: chrnorm/deployment-status@releases/v1
-        with:
-          token: ${{ github.token }}
-          target_url: https://demo-magento2.europe-west1.gcp.storefrontcloud.io
-          state: success
-          description: Congratulations! The deploy is done.
-          deployment_id: ${{ steps.deployment.outputs.deployment_id }}
-      - name: Update deployment status (failure)
-        if: failure()
-        uses: chrnorm/deployment-status@releases/v1
-        with:
-          token: ${{ github.token }}
-          target_url: https://demo-magento2.europe-west1.gcp.storefrontcloud.io
-          description: Unfortunately, the instance hasn't been updated.
-          state: failure
-          deployment_id: ${{ steps.deployment.outputs.deployment_id }}
+  deploy-develop:
+    uses: ./.github/workflows/deployment-template.yml
+    needs: build
+    if: github.ref == 'refs/heads/develop'
+    with:
+      github_environment_name: dev
+      environment_code: demo-magento2-dev
+      target_url: https://demo-magento2-dev.europe-west1.gcp.storefrontcloud.io
+    secrets:
+      cloud_username: ${{ secrets.CLOUD_USERNAME }}
+      cloud_password: ${{ secrets.CLOUD_PASSWORD }}
+      deployment_status_token: ${{ secrets.DEPLOYMENT_PERSONAL_ACCESS_TOKEN }}
+
+  deploy-release:
+    uses: ./.github/workflows/deployment-template.yml
+    needs: build
+    if: startsWith(github.ref, 'refs/heads/release')
+    with:
+      github_environment_name: canary
+      environment_code: demo-magento2-canary
+      target_url: https://demo-magento2-canary.europe-west1.gcp.storefrontcloud.io
+    secrets:
+      cloud_username: ${{ secrets.CLOUD_USERNAME }}
+      cloud_password: ${{ secrets.CLOUD_PASSWORD }}
+      deployment_status_token: ${{ secrets.DEPLOYMENT_PERSONAL_ACCESS_TOKEN }}
+
+  deploy-enterprise:
+    uses: ./.github/workflows/deployment-template.yml
+    needs: build
+    if: github.ref == 'refs/heads/enterprise'
+    with:
+      github_environment_name: enterprise
+      environment_code: demo-magento2-enterprise
+      target_url: https://demo-magento2-enterprise.europe-west1.gcp.storefrontcloud.io
+    secrets:
+      cloud_username: ${{ secrets.CLOUD_USERNAME }}
+      cloud_password: ${{ secrets.CLOUD_PASSWORD }}
+      deployment_status_token: ${{ secrets.DEPLOYMENT_PERSONAL_ACCESS_TOKEN }}

.github/workflows/deployment-template.yml

@@ -0,0 +1,69 @@
+ # https://docs.github.com/en/actions/using-workflows/reusing-workflows#creating-a-reusable-workflow
+on:
+  workflow_call:
+    inputs:
+      github_environment_name:
+        required: true
+        type: string
+
+      environment_code:
+        required: true
+        type: string
+
+      target_url:
+        required: true
+        type: string
+    secrets:
+       cloud_username:
+         required: true
+       cloud_password:
+         required: true
+       deployment_status_token: # can be ${{ github.token }}
+         required: true
+
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: chrnorm/deployment-action@releases/v1
+        name: Create GitHub deployment
+        id: deployment
+        with:
+          token: ${{ secrets.deployment_status_token }}
+          environment: ${{ inputs.github_environment_name }}
+          initial_status: in_progress
+          target_url: ${{ inputs.target_url }}
+      - name: Deploy on ${{ inputs.target_url }}
+        run: |
+          if curl -s -H 'X-User-Id: ${{ secrets.cloud_username }}'  -H 'X-Api-Key: ${{ secrets.cloud_password }}' -H 'Content-Type: application/json' -X POST -d '{
+              "code":"${{ inputs.environment_code }}",
+              "region":"europe-west1.gcp",
+              "frontContainerVersion":"${{ github.sha }}"
+            }' https://farmer.storefrontcloud.io/instances | grep -q '{"code":200,"result":"Instance updated!"}'; then
+            echo "Instance updated"
+          else
+            echo "Something went wrong during the update process..."
+            exit 1
+          fi
+
+      - name: Update deployment status (success)
+        if: success()
+        uses: chrnorm/deployment-status@releases/v1
+        with:
+          token: ${{ secrets.deployment_status_token }}
+          target_url: ${{ inputs.target_url }}
+          state: success
+          description: Congratulations! The deploy is done.
+          deployment_id: ${{ steps.deployment.outputs.deployment_id }}
+
+      - name: Update deployment status (failure)
+        if: failure()
+        uses: chrnorm/deployment-status@releases/v1
+        with:
+          token: ${{ secrets.deployment_status_token }}
+          target_url: ${{ inputs.target_url }}
+          description: Unfortunately, the instance hasn't been updated.
+          state: failure
+          deployment_id: ${{ steps.deployment.outputs.deployment_id }}
+

.github/workflows/speedcurve.yml

@@ -0,0 +1,25 @@
+name: "Run SpeedCurve test"
+
+on:
+  deployment_status
+
+jobs:
+  speedcurve:
+    if: github.event.deployment_status.state == 'success' && github.event.deployment.ref == 'refs/heads/develop'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Wait for container deployed on VSF Cloud to come online'
+        run: 'sleep 300'
+        shell: 'bash'
+
+      - name: Shorten deployment commit SHA
+        id: vars
+        shell: bash
+        run: echo "::set-output name=sha_short::$(echo ${{ github.event.deployment.sha }} | cut -c1-8)"
+
+      - name: 'Ask SpeedCurve to run performance tests'
+        uses: SpeedCurve-Metrics/[email protected]
+        with:
+          api_key: ${{ secrets.SPEEDCURVE_API_KEY }}
+          site_id: 744017
+          note: commit ${{ steps.vars.outputs.sha_short }}

.github/workflows/test.yml

@@ -12,6 +12,10 @@ on:
       - develop
       - release-**
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   test_repository:
     name: Build and test

.gitignore

@@ -118,3 +118,4 @@ dist
 .history/
 .graphqlconfig
 .idea
+docs.sh

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npx lerna run --parallel precommit
+yarn run --silent lint-staged

.lintstagedrc

@@ -0,0 +1,3 @@
+{
+  "*.{js,jsx,ts,tsx,vue}": "eslint --fix",
+}