chore: align main with develop (#455)

* Fix useFacet(...) customQuery implemention (#413)

* chore: release 1.0.0-rc.5.3 (#437)

* chore: add gitflow actions (#379)

* chore: added base gitflow actions

* chore: added base gitflow actions

* chore: fixed versioning process

* docs: added roadmap to the docs (#380)

closes #323

* fix(theme): refactor and fix store switcher (#383)

- update nuxt.config.js to handle de translation
- fix issue with flag icon #362
- refactor store switcher component
- add store name next to the language icon flag
- add translation info in docs

Co-authored-by: Bartosz Herba <[email protected]>

* fix(theme): fix preselection sort order when query param is available (#385)

Co-authored-by: Bartosz Herba <[email protected]>

* fix: broken cart after placing order as guest (#386)

* fix(theme): passing the email instead of the user-object for creating a guest-cart

* fix(composables): remove empty params in array, fails on Magento

* test(theme): updated test for attaching guest email address to cart

* Update packages/composables/src/composables/useShipping/index.ts

Co-authored-by: Heitor Ramon Ribeiro <[email protected]>

Co-authored-by: Marcin Kwiatkowski <[email protected]>
Co-authored-by: Heitor Ramon Ribeiro <[email protected]>

* fix(theme): fix flashing category page (#387)

Co-authored-by: Bartosz Herba <[email protected]>

* fix(theme): fix flashing category page (#388)

Co-authored-by: Bartosz Herba <[email protected]>

* fix: default billing information does not appear on address (#382)

* fix(theme): added badge for default-shipping and default-sbilling address

* fix(composables): sort addresses, put default shipping and billing address to top

* fix(theme): default billing and shipping text can be translated

* chore(theme): added translations

* fix(composables): removed console.log

* chore: upgraded vsf core to 2.5.4 (#389)

* chore: updated VSF core version to 2.5.4

* build: updated test GH action

* fix(composables): update url resolver clearing patter to remove locale prefix (#390)

Co-authored-by: Bartosz Herba <[email protected]>

* fix(theme): fix links to catch current locale (#391)

* fix(theme): M2-25 fix links to catch current locale

* Apply suggestions from code review

Co-authored-by: Heitor Ramon Ribeiro <[email protected]>

* test(test-utils): added localePath global mock to the test-utils

Co-authored-by: Bartosz Herba <[email protected]>
Co-authored-by: Heitor Ramon Ribeiro <[email protected]>
Co-authored-by: Marcin Kwiatkowski <[email protected]>

* style(theme): aligned titles in my account menu (#400)

* feat(middleware): added i18n route middleware (#408)

* feat(middleware): added i18n route middleware

closes #378

* refactor(middleware): i18n middleware: adjustements

* fix(theme): update localisation for all :link bindings (#416)

Co-authored-by: Bartosz Herba <[email protected]>

* docs(theme): update custom queries documentation to be more friendly and explicit (#418)

Co-authored-by: Bartosz Herba <[email protected]>

* chore(theme): removed html-validator (#414)

* refactor: update dependencies (#420)

* refactor(eslint): updated dependencies

- Updated `eslint-plugin-unicorn` to `40.0.0`

* refactor(eslint-import): updated dependencies

- Updated `eslint-plugin-import` to `2.25.4`

* refactor(eslint-jest): updated dependencies

- Updated `eslint-plugin-jest` to `25.3.4`

* refactor(eslint-typescript): updated dependencies

- Updated `@typescript-eslint/eslint-plugin` to `5.9.1`
- Updated `@typescript-eslint/parser` to `5.9.1`

* refactor(eslint-vue): updated dependencies

- Updated `eslint-plugin-vue` to `8.3.0`

* refactor(api-client): updated dependencies

- Updated `@apollo/client` to `3.5.7`
- Updated `dotenv` to `12.0.1`

* refactor(theme): updated dependencies

- Updated `@babel/core` to `7.16.7`
- Updated `babel-jest` to `27.4.6`
- Updated `cypress` to `9.2.1`
- Updated `dotenv` to `12.0.1`
- Updated `jest` to `27.4.7`
- Updated `jest-environment-jsdom` to `27.4.6`
- Updated `lint-staged` to `12.1.7`
- Updated `mocha` to `9.1.4`
- Updated `npm-check-updates` to `12.1.0`
- Updated `ts-jest` to `27.1.3`

* refactor: updated dependencies

- Updated `@babel/core` to `7.16.7`
- Updated `@babel/plugin-proposal-private-methods` to  `7.16.7`
- Updated `@commitlint/cli` to `16.0.2`
- Updated `@commitlint/config-conventional` to `16.0.0`
- Updated `@commitlint/config-lerna-scopes` to `16.0.0`
- Updated `@graphql-codegen/cli` to `2.3.1`
- Updated `@graphql-codegen/typescript` to `2.4.2`
- Updated `@graphql-codegen/typescript-operations` to  `2.2.2`
- Updated `@graphql-tools/utils` to `8.6.1`
- Updated `@rollup/plugin-node-resolve` to `13.1.3`
- Updated `@types/jest` to `27.4.0`
- Updated `@types/node` to `17.0.8`
- Updated `@typescript-eslint/parser` to `5.9.1`
- Updated `@vue/eslint-config-typescript` to `10.0.0`
- Updated `eslin` to `8.6.0`
- Updated `jest` to `27.4.7`
- Updated `lint-staged` to `12.1.7`
- Updated `npm-check-updates` to `12.1.0`
- Updated `rollup` to `2.64.0`
- Updated `shx` to `0.3.4`
- Updated `ts-jest` to `27.1.3```

* refactor(theme): enables currency switcher on TopBar.vue (#421)

* fix(theme): fix 404 issue when redirecting to address details page (#424)

Co-authored-by: Bartosz Herba <[email protected]>

* test: scaffold unit tests in composables and api client package (#419)

* test(composables): added jest config

* tests(composables): rewritten test + fix in productGetter

* tests(composables): updated configuration in jest.config.js

* tests(api-client): added tests for api-client + move general config to jest.base.config.js

* tests(api-client): added jest configuration + simple test

* chore: removed jest-environment-jsdom-sixteen

* tests(theme): reverted back and removed jest.base.config.json

* test(composables): reverted back and removed jest.base.config.json

* test(api-client): reverted back and removed jest.base.config.json

* chore: removed jest.base.config.json

Co-authored-by: Marcin Kwiatkowski <[email protected]>

* fix(theme): fix disappearing category sidebar filter change (#423)

Co-authored-by: Bartosz Herba <[email protected]>

* fix(theme): out of stock product will no longer break cart (#404)

* fix(theme): out of stock product will no longer break cart

* fix(theme): remove cart load from layout

* docs(theme): update tests for CartSidebar

Co-authored-by: Bartosz Herba <[email protected]>

* Revert "refactor(theme): enables currency switcher on TopBar.vue (#421)" (#426)

This reverts commit fbb1598.

* refactor(i18n): changed i18n middleware to plugin and fix store switc… (#425)

* refactor(i18n): changed i18n middleware to plugin and fix store switcher by url issues

* refactor: cR fixes for i18n

* refactor(theme): changed i18n midl. to plugin & fix store switcher by url (#431)

* refactor(i18n): changed i18n middleware to plugin and fix store switcher by url issues

* refactor: cR fixes for i18n

* refactor(composables): added `ConfigState` to export API

* chore: updated yarn.lock

* refactor(theme): updated i18n middleware to fix URL redirect

* docs: updated API-Extractor

Co-authored-by: Marcin Kwiatkowski <[email protected]>

* fix(api-client): update default mutation error handling for apollo client (#429)

Co-authored-by: Bartosz Herba <[email protected]>

* fix: expired user token (#392)

* fix(theme): disabled checkbox on login-modal

* feat(theme): log customer out when customer-token is expired

* feat: added token expired notification, clear cart and customer token when customer is not logged in

* feat: logged out notification

* refactor: removed console log

* refactor: added improvements for token-expired plugin, added unit tests

* refactor: changed log out notification message

* test: fixed token-expired plugin test

* test: added cookies mock to test-utils

Co-authored-by: Marcin Kwiatkowski <[email protected]>

* refactor(theme): enable the currency switcher on `TopBar.vue` (#430)

* refactor(theme): enables currency switcher on TopBar.vue

* refactor(theme): add safe checking on Currency Selector

* Fix useFacet(...) customQuery implemention (#413)

* chore: updated version number to rc.5.3, updated yarn.lock, fixed cloud action

* fix(theme): update localisation for all :link bindings (#449)

Co-authored-by: Bartosz Herba <[email protected]>

Co-authored-by: Heitor Ramon Ribeiro <[email protected]>
Co-authored-by: Bartosz Herba <[email protected]>
Co-authored-by: Bartosz Herba <[email protected]>
Co-authored-by: Kevin Gorjan <[email protected]>
Co-authored-by: Aliaaaam <[email protected]>

Co-authored-by: Aliaaaam <[email protected]>
Co-authored-by: Heitor Ramon Ribeiro <[email protected]>
Co-authored-by: Bartosz Herba <[email protected]>
Co-authored-by: Bartosz Herba <[email protected]>
Co-authored-by: Kevin Gorjan <[email protected]>

Author: 5 people

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

@@ -4,6 +4,7 @@ on:
     branches:
       - main
       - develop
+      - release/*
 
 jobs:
   build:

packages/api-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/magento-api",
-  "version": "1.0.0-rc.5.2.2",
+  "version": "1.0.0-rc.5.3",
   "sideEffects": false,
   "homepage": "https://github.com/vuestorefront/magento2",
   "bugs": {

packages/composables/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/magento",
-  "version": "1.0.0-rc.5.2.2",
+  "version": "1.0.0-rc.5.3",
   "license": "MIT",
   "homepage": "https://github.com/vuestorefront/magento2",
   "bugs": {
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@vue-storefront/core": "~2.5.4",
-    "@vue-storefront/magento-api": "1.0.0-rc.5.2.2",
+    "@vue-storefront/magento-api": "1.0.0-rc.5.3",
     "@vue/composition-api": "^1.4.1",
     "cookie-universal": "^2.1.5",
     "vue": "^2.6.14",

packages/composables/src/composables/useFacet/index.ts

@@ -35,6 +35,7 @@ const constructFilterObject = (inputFilters: Object) => {
   Object.keys(inputFilters).forEach((key) => {
     if (key === 'price') {
       const price = { from: 0, to: 0 };
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       const flatPrices = inputFilters[key].flatMap((inputFilter) => inputFilter.split('_').map((str) => Number.parseFloat(str))).sort((a, b) => a - b);
 
       [price.from] = flatPrices;
@@ -94,7 +95,8 @@ const factoryParams = {
       currentPage: productParams.page,
     };
 
-    const { data } = await context.$magento.api.products(productSearchParams);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    const { data } = await context.$magento.api.products(productSearchParams, params?.input.customQuery || {});
 
     Logger.debug('[Result]:', { data });
 

packages/theme/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/magento-theme",
-  "version": "1.0.0-rc.5.2.2",
+  "version": "1.0.0-rc.5.3",
   "private": true,
   "license": "MIT",
   "homepage": "https://github.com/vuestorefront/magento2",
@@ -33,7 +33,7 @@
     "@nuxtjs/style-resources": "^1.2.1",
     "@storefront-ui/vue": "^0.11.5",
     "@vue-storefront/core": "~2.5.4",
-    "@vue-storefront/magento": "1.0.0-rc.5.2.2",
+    "@vue-storefront/magento": "1.0.0-rc.5.3",
     "@vue-storefront/middleware": "~2.5.4",
     "@vue-storefront/nuxt": "~2.5.4",
     "@vue-storefront/nuxt-theme": "~2.5.4",