Revert "chore: sync version-2.4 to main branch (vuestorefront#6312)…

…" (vuestorefront#6337) This reverts commit dc3165a.
patentcounsel · Sep 24, 2021 · 9550643 · 9550643
1 parent dc3165a
commit 9550643
Show file tree

Hide file tree

Showing 210 changed files with 4,979 additions and 21,078 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -54,3 +54,4 @@
 #### Docs
 - [ ] My change requires a change to the documentation.
 - [ ] I have updated the documentation accordingly.
+
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -14,10 +14,9 @@ commercetools:
 boilerplate:
 - packages/boilerplate/**/*
 
-# Add 'docs' label to any change to packages/core/docs files
+# Add 'docs' label to any change to packages/core/docs files EXCEPT for the changelog
 docs:
-- packages/core/docs/**/*
-- packages/core/docs/.vuepress/**/*
+- any: ['packages/core/docs/**/*', '!packages/core/docs/changelog/**/*']
 
 # Add 'ci' label to any change to continuous integration files inside .github folder
 ci:

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -22,9 +22,7 @@ jobs:
         id: get_version
         run: echo ::set-output name=VERSION::$(cat version.txt)
       - name: Build and publish docker image
-        # uses: elgohr/Publish-Docker-Github-Action@master
-        # 3.04 is hardcoded as a workaround for https://github.com/elgohr/Publish-Docker-Github-Action/issues/134
-        uses: elgohr/[email protected]
+        uses: elgohr/Publish-Docker-Github-Action@master
         with:
           name: docs-storefrontcloud-io/v2:${{ steps.get_version.outputs.VERSION }}
           registry: registry.storefrontcloud.io

diff --git a/.github/workflows/deploy-lighthouse.yml b/.github/workflows/deploy-lighthouse.yml
@@ -7,7 +7,8 @@ on:
     types:
       - completed
     branches:
-      - next
+      - master
+      - main
 
 jobs:
   deploy:

diff --git a/.github/workflows/deploy-preview-storefrontcloud.yml b/.github/workflows/deploy-preview-storefrontcloud.yml
@@ -13,9 +13,7 @@ jobs:
         with:
           node-version: "12.x"
       - name: Build and publish docker image
-        # uses: elgohr/Publish-Docker-Github-Action@master
-        # 3.04 is hardcoded as a workaround for https://github.com/elgohr/Publish-Docker-Github-Action/issues/134
-        uses: elgohr/[email protected]
+        uses: elgohr/Publish-Docker-Github-Action@master
         with:
           name: vsf-next-demo-storefrontcloud-io/vue-storefront:${{ github.sha }}
           registry: registry.storefrontcloud.io

diff --git a/.github/workflows/deploy-storefrontcloud.yml b/.github/workflows/deploy-storefrontcloud.yml
@@ -2,7 +2,8 @@ name: Deploy to Storefrontcloud
 on:
   push:
     branches:
-      - next
+      - master
+      - main
       - release/next
       - test/next
 jobs:
@@ -16,9 +17,7 @@ jobs:
         with:
           node-version: "12.x"
       - name: Build and publish docker image
-        # uses: elgohr/Publish-Docker-Github-Action@master
-        # 3.04 is hardcoded as a workaround for https://github.com/elgohr/Publish-Docker-Github-Action/issues/134
-        uses: elgohr/[email protected]
+        uses: elgohr/Publish-Docker-Github-Action@master
         with:
           name: vsf-next-demo-storefrontcloud-io/vue-storefront:${{ github.sha }}
           registry: registry.storefrontcloud.io

diff --git a/.github/workflows/run-e2e-regression.yml b/.github/workflows/run-e2e-regression.yml
@@ -13,6 +13,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          ref: develop
 
       - name: Setup node
         uses: actions/setup-node@v2
@@ -30,13 +32,15 @@ jobs:
       - name: Install dependencies
         run: yarn install
 
-      - name: Build tools
-        run: yarn build:${{ matrix.package }}:tools
+      - name: Build package
+        run: yarn build:${{ matrix.package }}
+        env:
+          NUXT_ENV_E2E: true
 
       - name: Run cypress tests
         uses: cypress-io/[email protected]
         with:
-          start: yarn dev:${{ matrix.package }}
+          start: yarn start:${{ matrix.package }}
           wait-on: 'http://localhost:3000'
           wait-on-timeout: 180
           command: yarn run test:e2e:${{ matrix.package }}:hl

diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml
@@ -40,13 +40,15 @@ jobs:
       - name: Install dependencies
         run: yarn install
 
-      - name: Build tools
-        run: yarn build:${{ github.event.inputs.package }}:tools
+      - name: Build package
+        run: yarn build:${{ github.event.inputs.package }}
+        env:
+          NUXT_ENV_E2E: true
 
       - name: Run cypress tests
         uses: cypress-io/[email protected]
         with:
-          start: yarn dev:${{ github.event.inputs.package }}
+          start: yarn start:${{ github.event.inputs.package }}
           wait-on: 'http://localhost:3000'
           wait-on-timeout: 180
           command: yarn run test:e2e:${{ github.event.inputs.package }}:hl

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,10 +3,14 @@ name: Run tests
 on:
   push:
     branches:
-      - next
+      - main
+      - develop
+      - release-**
   pull_request:
     branches:
-      - next
+      - main
+      - develop
+      - release-**
 
 jobs:
   prepare_dependencies:
@@ -74,12 +78,18 @@ jobs:
       - name: Build core
         run: yarn build:core
 
-      - name: Test core
-        run: yarn test:core --coverage
+      - name: Test cache
+        run: yarn test:cache --coverage
 
       - name: Test CLI
         run: yarn test:cli --coverage
 
+      - name: Test core
+        run: yarn test:core --coverage
+
+      - name: Test middleware
+        run: yarn test:middleware --coverage
+
   validate_integrations:
     name: Validate ${{ matrix.integration }}
     needs: validate_core

diff --git a/README.md b/README.md
@@ -1,8 +1,10 @@
 ![Vue Storefront](https://camo.githubusercontent.com/48c886ac0703e3a46bc0ec963e20f126337229fc/68747470733a2f2f643968687267346d6e767a6f772e636c6f756466726f6e742e6e65742f7777772e76756573746f726566726f6e742e696f2f32383062313964302d6c6f676f2d76735f3062793032633062793032633030303030302e6a7067)
-# Vue Storefront 2 (previously known as Next)
+# Vue Storefront 2
 
 
-[![Coverage Status](https://coveralls.io/repos/github/vuestorefront/vue-storefront/badge.svg?branch=next) ](https://coveralls.io/github/vuestorefront/vue-storefront/?branch=next)<a href="https://discord.vuestorefront.io">![Discord](https://img.shields.io/discord/770285988244750366?label=join%20discord&logo=Discord&logoColor=white)</a>
+[![Coverage Status](https://coveralls.io/repos/github/vuestorefront/vue-storefront/badge.svg?branch=next) ](https://coveralls.io/github/vuestorefront/vue-storefront/?branch=next)
+[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
+[![Discord](https://img.shields.io/discord/770285988244750366?label=join%20discord&logo=Discord&logoColor=white)](https://discord.vuestorefront.io)
 
 Vue Storefront is the most popular and most advanced Frontend Platform for eCommerce
 - [Documentation](https://docs.vuestorefront.io/v2/)
@@ -76,4 +78,3 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
 Vue Storefront source code is completely free and released under the [MIT License](https://github.com/vuestorefront/vue-storefront/blob/master/LICENSE).
 
 [![analytics](http://www.google-analytics.com/collect?v=1&t=pageview&_s=1&dl=https%3A%2F%2Fgithub.com%2FDivanteLtd%2Fvue-storefront&_u=MAC~&cid=1757014354.1393964045&tid=UA-108235765-10)]()
-
diff --git a/cypress.json b/cypress.json
@@ -2,6 +2,5 @@
     "baseUrl": "https://lovecrafts-demo.storefrontcloud.io/",
     "viewportWidth": 1280,
     "viewportHeight": 1024
-
   }
 
diff --git a/package.json b/package.json
@@ -1,71 +1,66 @@
 {
   "name": "root",
   "private": true,
-  "engines": {
-    "node": ">=10.x"
-  },
   "scripts": {
-    "build:docs": "cd packages/core/docs && yarn build",
-    "dev:docs": "cd packages/core/docs && yarn dev",
+    "build:bp": "yarn build:bp:tools && yarn build:bp:theme",
+    "build:bp:api-client": "cd packages/boilerplate/api-client && yarn build",
+    "build:bp:composables": "cd packages/boilerplate/composables && yarn build",
+    "build:bp:theme": "cd packages/boilerplate/theme && yarn build",
+    "build:bp:tools": "yarn build:core && yarn build:bp:api-client && yarn build:bp:composables",
     "build:core": "yarn build:core:core && yarn build:core:cache && yarn build:core:middleware",
     "build:core:core": "cd packages/core/core && yarn build",
     "build:core:cache": "cd packages/core/cache && yarn build",
     "build:core:middleware": "cd packages/core/middleware && yarn build",
-    "build:spr:api-client": "cd packages/spryker/api-client && yarn build",
-    "build:spr:composables": "cd packages/spryker/composables && yarn build",
-    "build:spr:tools": "yarn build:core && yarn build:spr:api-client && yarn build:spr:composables",
-    "build:spr:theme": "cd packages/spryker/theme && yarn build",
-    "build:spr": "yarn build:spr:tools && yarn build:spr:theme",
-    "dev:spr": "cd packages/spryker/theme && yarn dev",
-    "dev:spr:api-client": "cd packages/spryker/api-client && yarn dev",
-    "dev:spr:composables": "cd packages/spryker/composables && yarn dev",
-    "build:bp:api-client": "cd packages/boilerplate/api-client && yarn build",
-    "build:bp:composables": "cd packages/boilerplate/composables && yarn build",
-    "build:bp:tools": "yarn build:core && yarn build:bp:api-client && yarn build:bp:composables",
-    "build:bp:theme": "cd packages/boilerplate/theme && yarn build",
-    "build:bp": "yarn build:bp:tools && yarn build:bp:theme",
-    "dev:bp": "cd packages/boilerplate/theme && yarn dev",
+    "build:ct": "yarn build:ct:tools && yarn build:ct:theme",
     "build:ct:api-client": "cd packages/commercetools/api-client && yarn build",
     "build:ct:composables": "cd packages/commercetools/composables && yarn build",
-    "build:middleware": "cd packages/core/middleware && yarn build",
-    "build:ct:tools": "yarn build:core && yarn build:ct:api-client && yarn build:ct:composables",
     "build:ct:theme": "cd packages/commercetools/theme && yarn build",
-    "build:ct": "yarn build:core && yarn build:ct:tools && yarn build:ct:theme",
-    "build:sp:tools": "yarn build:core && yarn build:sp:api-client && yarn build:sp:composables",
-    "build:sp": "yarn build:core && yarn build:sp:tools && yarn build:sp:theme",
-    "test:ct:api-client": "cd packages/commercetools/api-client && yarn test",
-    "test:ct:composables": "cd packages/commercetools/composables && yarn test",
-    "test:core": "jest -c ./packages/core/jest.config.js",
-    "test:ct": "yarn test:ct:api-client && yarn test:ct:composables",
-    "test:e2e": "./node_modules/.bin/cypress open",
-    "test:cli": "cd packages/core/cli && yarn test",
-    "start:ct": "cd packages/commercetools/theme && yarn start",
+    "build:ct:tools": "yarn build:core && yarn build:ct:api-client && yarn build:ct:composables",
+    "build:docs": "cd packages/core/docs && yarn build",
+    "build:middleware": "cd packages/core/middleware && yarn build",
+    "cli": "cd packages/core/cli && yarn cli",
+    "commit": "cz",
+    "core:changelog": "cd packages/core/docs/scripts && node changelog",
+    "ct:changelog": "cd packages/core/docs/scripts && node changelog --in ../commercetools/changelog --out ../commercetools/changelog.md",
+    "dev:bp": "cd packages/boilerplate/theme && yarn dev",
+    "dev:ct": "cd packages/commercetools/theme && yarn dev",
     "dev:ct:api-client": "cd packages/commercetools/api-client && yarn dev",
     "dev:ct:composables": "cd packages/commercetools/composables && yarn dev",
-    "dev:ct": "cd packages/commercetools/theme && yarn dev",
+    "dev:docs": "cd packages/core/docs && yarn dev",
     "link-packages": "lerna link --force-local",
     "lint": "eslint . --ext .js,.ts,.vue",
-    "release": "cd scripts && yarn release",
-    "cli": "cd packages/core/cli && yarn cli",
+    "start:bp": "cd packages/boilerplate/theme && yarn start",
+    "start:ct": "cd packages/commercetools/theme && yarn start",
+    "test:cache": "cd packages/core/cache && yarn test",
+    "test:cli": "cd packages/core/cli && yarn test",
+    "test:core": "cd packages/core/core && yarn test",
+    "test:middleware": "cd packages/core/middleware && yarn test",
+    "test:ct": "yarn test:ct:api-client && yarn test:ct:composables",
+    "test:ct:api-client": "cd packages/commercetools/api-client && yarn test",
+    "test:ct:composables": "cd packages/commercetools/composables && yarn test",
+    "test:e2e": "./node_modules/.bin/cypress open",
     "test:e2e:bp": "cd packages/boilerplate/theme && yarn run test:e2e",
-    "test:e2e:bp:hl": "cd packages/boilerplate/theme && yarn run test:e2e:hl",
     "test:e2e:bp:generate:report": "cd packages/boilerplate/theme && yarn run test:e2e:generate:report",
+    "test:e2e:bp:hl": "cd packages/boilerplate/theme && yarn run test:e2e:hl",
     "test:e2e:ct": "cd packages/commercetools/theme && yarn run test:e2e",
-    "test:e2e:ct:hl": "cd packages/commercetools/theme && yarn run test:e2e:hl",
     "test:e2e:ct:generate:report": "cd packages/commercetools/theme && yarn run test:e2e:generate:report",
-    "core:changelog": "cd packages/core/docs/scripts && node changelog --in ../changelog --out ../contributing/changelog.md",
-    "ct:changelog": "cd packages/core/docs/scripts && node changelog --in ../commercetools/changelog --out ../commercetools/changelog.md"
+    "test:e2e:ct:hl": "cd packages/commercetools/theme && yarn run test:e2e:hl"
   },
   "devDependencies": {
     "@babel/core": "^7.10.5",
+    "@commitlint/cli": "^13.1.0",
+    "@commitlint/config-conventional": "^13.1.0",
+    "@commitlint/config-lerna-scopes": "^13.1.0",
     "@rollup/plugin-babel": "^5.1.0",
     "@rollup/plugin-replace": "^2.3.3",
-    "@types/jest": "^24.0.23",
+    "@types/jest": "^26.0.24",
     "@types/node": "^12.12.14",
     "@typescript-eslint/eslint-plugin": "^4.15.2",
     "@typescript-eslint/parser": "^4.15.2",
     "@vue/eslint-config-typescript": "^7.0.0",
+    "commitizen": "^4.2.4",
     "cross-env": "^6.0.3",
+    "cz-conventional-changelog": "^3.3.0",
     "eslint": "^7.20.0",
     "eslint-config-standard": "^16.0.2",
     "eslint-plugin-import": "^2.22.1",
@@ -74,14 +69,14 @@
     "eslint-plugin-standard": "^5.0.0",
     "eslint-plugin-vue": "^7.6.0",
     "husky": "^4.2.3",
-    "jest": "^24.9.0",
+    "jest": "^27.0.6",
     "lerna": "^3.15.0",
     "lint-staged": "^10.0.7",
     "rimraf": "^3.0.2",
     "rollup": "^1.25.2",
     "rollup-plugin-terser": "^5.1.2",
     "rollup-plugin-typescript2": "^0.30.0",
-    "ts-jest": "^24.2.0",
+    "ts-jest": "^27.0.3",
     "ts-node": "^8.4.1",
     "tslib": "^2.1.0",
     "typescript": "^4.2.2",
@@ -100,5 +95,15 @@
   },
   "lint-staged": {
     "*.{js,ts,vue}": "eslint --fix"
+  },
+  "config": {
+    "commitizen": {
+      "path": "cz-conventional-changelog",
+      "maxHeaderWidth": 100,
+      "maxLineWidth": 100
+    }
+  },
+  "engines": {
+    "node": ">=12.x"
   }
 }
diff --git a/packages/boilerplate/api-client/package.json b/packages/boilerplate/api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/boilerplate-api",
-  "version": "2.4.2",
+  "version": "2.4.1",
   "private": true,
   "sideEffects": false,
   "server": "server/index.js",
@@ -14,7 +14,7 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@vue-storefront/core": "~2.4.2"
+    "@vue-storefront/core": "~2.4.1"
   },
   "devDependencies": {
     "rollup-plugin-typescript2": "^0.30.0",

diff --git a/packages/boilerplate/composables/package.json b/packages/boilerplate/composables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/boilerplate",
-  "version": "2.4.2",
+  "version": "2.4.1",
   "private": true,
   "sideEffects": false,
   "main": "lib/index.cjs.js",
@@ -13,8 +13,8 @@
     "prepublish": "yarn build"
   },
   "dependencies": {
-    "@vue-storefront/boilerplate-api": "~2.4.2",
-    "@vue-storefront/core": "~2.4.2"
+    "@vue-storefront/boilerplate-api": "~2.4.1",
+    "@vue-storefront/core": "~2.4.1"
   },
   "devDependencies": {
     "rollup-plugin-typescript2": "^0.30.0",

diff --git a/packages/boilerplate/composables/src/getters/checkoutGetters.ts b/packages/boilerplate/composables/src/getters/checkoutGetters.ts
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,3 +54,4 @@
		#### Docs
		- [ ] My change requires a change to the documentation.
		- [ ] I have updated the documentation accordingly.
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,8 @@ on: @@
         types:
           - completed
         branches:
-          - next
+          - master
+          - main
     jobs:
       deploy:
@@ Expand Down @@