Merge branch 'main' into release/1.0.0-rc.9

Marcin Kwiatkowski · Marcin Kwiatkowski · commit 2bd0d0eb7c6c · 2022-06-10T08:57:07.000+02:00
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -1,3 +1,5 @@
+const GTM_TAG = 'GTM-WMDC3CP';
+
 module.exports = {
   title: 'Vue Storefront 2 for Magento',
   base: '/',
diff --git a/docs/assets/images/magento-marketplace-access-keys.jpg b/docs/assets/images/magento-marketplace-access-keys.jpg
diff --git a/docs/guide/api-client/reference.md b/docs/guide/api-client/reference.md
@@ -0,0 +1,13 @@
+# Api methods
+
+## cmsBlocks
+
+The cmsBlocks API method allows loading information about CMS blocks.
+
+[The cmsBlocks API method reference](/api-reference/magento-api.cmsblocks.html)
+
+## cmsPage
+
+The cmsPage API method allows loading information about CMS page.
+
+[The cmsPage API method reference](/api-reference/magento-api.cmspage.html)
diff --git a/docs/guide/override-queries.md b/docs/guide/override-queries.md
@@ -1,4 +1,4 @@
-# Override queries
+# Override default queries
 
 To override one or multiple queries without creating a custom composable for each usage, you can override the defaults ones with the `customQueries` attribute in the `middleware.config.js`file.
 
@@ -72,8 +72,9 @@ module.exports = {
   },
 };
 
+### Important notes
 
-```
+**Only** attributes presented on `ProductInterface` are accessible via GraphQL without any additional modification on the Magento side.
 
 **Important**
 
diff --git a/packages/api-client/README.md b/packages/api-client/README.md
@@ -146,4 +146,3 @@ Thanks go to these wonderful people 🙌:
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
-
diff --git a/packages/composables/README.md b/packages/composables/README.md
@@ -146,4 +146,3 @@ Thanks go to these wonderful people 🙌:
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
-
diff --git a/packages/theme/modules/catalog/category/composables/useFacet/PerPageOptions.ts b/packages/theme/modules/catalog/category/composables/useFacet/PerPageOptions.ts
@@ -0,0 +1 @@
+export const PerPageOptions = [10, 20, 50];
diff --git a/packages/theme/modules/catalog/category/composables/useFacet/SortingOptions.ts b/packages/theme/modules/catalog/category/composables/useFacet/SortingOptions.ts
@@ -0,0 +1,35 @@
+export enum SortingOptionsValuesEnum {
+  DEFAULT = '',
+  NAME_ASC = 'name_ASC',
+  NAME_DESC = 'name_DESC',
+  PRICE_ASC = 'price_ASC',
+  PRICE_DESC = 'price_DESC',
+}
+
+export interface SortingOptionsInterface {
+  label: string,
+  value: SortingOptionsValuesEnum
+}
+
+export const SortingOptions: SortingOptionsInterface[] = [
+  {
+    label: 'Sort: Default',
+    value: SortingOptionsValuesEnum.DEFAULT,
+  },
+  {
+    label: 'Sort: Name A-Z',
+    value: SortingOptionsValuesEnum.NAME_ASC,
+  },
+  {
+    label: 'Sort: Name Z-A',
+    value: SortingOptionsValuesEnum.NAME_DESC,
+  },
+  {
+    label: 'Sort: Price from low to high',
+    value: SortingOptionsValuesEnum.PRICE_ASC,
+  },
+  {
+    label: 'Sort: Price from high to low',
+    value: SortingOptionsValuesEnum.PRICE_DESC,
+  },
+];
diff --git a/packages/theme/modules/catalog/category/composables/useFacet/perPageOptions.ts b/packages/theme/modules/catalog/category/composables/useFacet/perPageOptions.ts
@@ -1 +1 @@
-export const perPageOptions = [10, 20, 50];
+export const PerPageOptions = [10, 20, 50];
diff --git a/packages/theme/modules/catalog/category/composables/useFacet/sortingOptions.ts b/packages/theme/modules/catalog/category/composables/useFacet/sortingOptions.ts
@@ -1,13 +1,3 @@
-export interface SortingModel {
-  selected: string,
-  options: SortingOption[]
-}
-
-export interface SortingOption {
-  label: string,
-  value: SortingOptionsValuesEnum
-}
-
 export enum SortingOptionsValuesEnum {
   DEFAULT = '',
   NAME_ASC = 'name_ASC',
@@ -16,7 +6,12 @@ export enum SortingOptionsValuesEnum {
   PRICE_DESC = 'price_DESC',
 }
 
-export const sortingOptions: SortingOption[] = [
+export interface SortingOptionsInterface {
+  label: string,
+  value: SortingOptionsValuesEnum
+}
+
+export const SortingOptions: SortingOptionsInterface[] = [
   {
     label: 'Sort: Default',
     value: SortingOptionsValuesEnum.DEFAULT,
diff --git a/packages/theme/modules/checkout/pages/Checkout/Billing.vue b/packages/theme/modules/checkout/pages/Checkout/Billing.vue
@@ -389,6 +389,7 @@ export default defineComponent({
       return addresses.value.length > 0;
     });
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     const countriesList = computed(() => addressGetter.countriesList(countries.value));
     const regionInformation = computed(() => addressGetter.regionList(country.value));
 
diff --git a/yarn.lock b/yarn.lock
@@ -21,18 +21,18 @@
   resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.5.10.tgz#43463108a6e07ae602cca0afc420805a19339a71"
   integrity sha512-tL3iSpFe9Oldq7gYikZK1dcYxp1c01nlSwtsMz75382HcI6fvQXyFXUCJTTK3wgO2/ckaBvRGw7VqjFREdVoRw==
   dependencies:
-    "@graphql-typed-document-node/core" "^3.0.0"
+    "@graphql-typed-document-node/core" "^3.1.1"
     "@wry/context" "^0.6.0"
     "@wry/equality" "^0.5.0"
     "@wry/trie" "^0.3.0"
-    graphql-tag "^2.12.3"
+    graphql-tag "^2.12.6"
     hoist-non-react-statics "^3.3.2"
     optimism "^0.16.1"
     prop-types "^15.7.2"
     symbol-observable "^4.0.0"
-    ts-invariant "^0.9.4"
+    ts-invariant "^0.10.3"
     tslib "^2.3.0"
-    zen-observable-ts "^1.2.0"
+    zen-observable-ts "^1.2.5"
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3":
   version "7.16.7"
@@ -1718,7 +1718,7 @@
     tslib "~2.3.0"
     value-or-promise "1.0.11"
 
-"@graphql-typed-document-node/core@^3.0.0":
+"@graphql-typed-document-node/core@^3.0.0", "@graphql-typed-document-node/core@^3.1.1":
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.1.1.tgz#076d78ce99822258cf813ecc1e7fa460fa74d052"
   integrity sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg==
@@ -5811,6 +5811,15 @@ bl@^4.0.3, bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
+bl@^4.0.3, bl@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
 blessed@0.1.81:
   version "0.1.81"
   resolved "https://registry.yarnpkg.com/blessed/-/blessed-0.1.81.tgz#f962d687ec2c369570ae71af843256e6d0ca1129"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+const GTM_TAG = 'GTM-WMDC3CP';`
	`2`	`+`
`1`	`3`	`module.exports = {`
`2`	`4`	`title: 'Vue Storefront 2 for Magento',`
`3`	`5`	`base: '/',`
Original file line number	Diff line number	Diff line change
`@@ -146,4 +146,3 @@ Thanks go to these wonderful people 🙌:`
`146`	`146`	`<!-- ALL-CONTRIBUTORS-LIST:END -->`
`147`	`147`
`148`	`148`	`This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!`
`149`		`-`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export const PerPageOptions = [10, 20, 50];`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export const perPageOptions = [10, 20, 50];`
	`1`	`+export const PerPageOptions = [10, 20, 50];`