Skip to content

Commit da562a1

Browse files
bartoszherbaMarcin Kwiatkowskisethidden
committed
refactor(composables): align refactor perf improvements branch to current develop (#713)
* refactor(theme): refactored Page route to use asyncData * perf(theme): refactored asyncData to useAsync on page.vue * refactor(theme): restored redis support for cms pages * refactor(theme): add nuxt/pinia module to manage app state (#568) Co-authored-by: Bartosz Herba <[email protected]> * refactor(theme): add core pinia module * refactor(theme): refactored AppHeader to use the useAsync composable instead of onSSR (#570) * refactor(theme): refactor useConfig composable (#572) - mark composable useCnfig as deprecated - move composable to theme module - rework composable to get rid of core dependency and to utilize Pinia store Co-authored-by: Bartosz Herba <[email protected]> * refactor(composables): moved the useExternalCheckout composable to theme (#571) * refactor: m2-154. refactor use store composable to use pinia store (#576) * temp use store * refactor(theme): refactor useStore composable - mark useStore as deprecated in composables - add useStore composable in a theme module BREAKING CHANGE: rework useStore composable Co-authored-by: Bartosz Herba <[email protected]> * refactor: restored loadUser in app header * refactor: useWishlist (#577) * refactor: refactored context binding * refactor: refactored useWishlist, fixed removing from wishlist in my account * refactor: wishlist: cr changes * refactor(theme): M2 155. refactor useCurrency composable (#579) * refactor(theme): move stores to pinia store * refactor(theme): refactor useCurrency composable BREAKING CHANGES: - mark useCurrency as a deprecated in composables module - add refactored and lightweight useCurrency in theme with usage of pinia store management Co-authored-by: Bartosz Herba <[email protected]> * refactor: useUser (#582) * refactor: added new theme composable: useUser * refactor(theme): changed useUser binding to the new composable * refactor(useuser): added types * docs: added depracated infor to useUser composable * refactor: removed console.log * refactor(theme): refactored UseForgotPassword (#583) * refactor: refactored useCategory composable (#585) * refactor: refactored useFacet composable (#587) * refactor(theme): refactor useCart composable (#584) Co-authored-by: Bartosz Herba <[email protected]> * refactor: refactored useCategorySearch (#589) * refactor(theme): refactor useContent composable (#590) BREAKING CHANGE: - mark useContent as deprecated, implement useContent in theme package * fix(theme): fix page component data load * refactor: refactored usecontent to work with useasync composable * refactor: a/B testing: changed config loading from on moundted to useFetch (#593) * fix: fixed ssr issues (#594) * refactor: restored chunks * refactor: removed chunks * test: a/b: disabled config loading, and navigation * refactor(theme): refactor useUiState (#595) Co-authored-by: Bartosz Herba <[email protected]> * - fix issues with dynamic modules import - fix issues with useUiState import * - update cart store and usage of useCart composable * - fix wishlist issues after merge * - mark tests as skipped for a further refactor * Update .github/workflows/deploy-vue-storefront-cloud.yml Co-authored-by: Artur Tagisow <[email protected]> * Update .github/workflows/deploy-vue-storefront-cloud.yml * Update packages/composables/src/composables/useCart/index.ts * Update packages/composables/src/composables/useCart/index.ts * Update packages/composables/src/composables/useCategorySearch/index.ts * Update packages/theme/composables/useCart/commands/loadTotalQtyCommand.ts * Update packages/composables/src/composables/useCategorySearch/index.ts * Update packages/composables/src/composables/useConfig/index.ts * Update packages/composables/src/composables/useContent/index.ts * Update packages/composables/src/composables/useContent/index.ts * - update docblocks Co-authored-by: Marcin Kwiatkowski <[email protected]> Co-authored-by: Bartosz Herba <[email protected]> Co-authored-by: Artur Tagisow <[email protected]>
1 parent aaa1162 commit da562a1

File tree

114 files changed

+2654
-119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+2654
-119
lines changed

packages/api-client/src/types/GraphQL.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -660,13 +660,13 @@ export interface Cart {
660660
/** The entered gift message for the cart */
661661
gift_message?: Maybe<GiftMessage>;
662662
/** The unique ID for a `Cart` object */
663-
id: Scalars['ID'];
664-
is_virtual: Scalars['Boolean'];
663+
id?: Maybe<Scalars['ID']>;
664+
is_virtual: Maybe<Scalars['Boolean']>;
665665
items?: Maybe<Array<Maybe<CartItemInterface>>>;
666666
prices?: Maybe<CartPrices>;
667667
selected_payment_method?: Maybe<SelectedPaymentMethod>;
668-
shipping_addresses: Array<Maybe<ShippingCartAddress>>;
669-
total_quantity: Scalars['Float'];
668+
shipping_addresses?: Maybe<Array<Maybe<ShippingCartAddress>>>;
669+
total_quantity?: Maybe<Scalars['Float']>;
670670
}
671671

672672
export interface CartAddressCountry {

packages/composables/nuxt/plugin.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import cookie from '@vue-storefront/magento/nuxt/cookie';
55

66
const moduleOptions = JSON.parse('<%= JSON.stringify(options) %>');
77

8+
// TODO should be moved to THEME and expose consistent cookie management API
89
export default integrationPlugin(({ app, res, req, integration }) => {
910
const cartCookieName = moduleOptions.cookies?.cartCookieName || defaultConfig.cookies.cartCookieName;
1011
const customerCookieName = moduleOptions.cookies?.customerCookieName || defaultConfig.cookies.customerCookieName;

packages/composables/src/composables/useCart/index.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
/* istanbul ignore file */
2-
/* eslint-disable no-param-reassign */
1+
/**
2+
* @deprecated since version 1.0.0
3+
*/
34
import {
45
ComposableFunctionArgs,
56
Context,

packages/composables/src/composables/useCategorySearch/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ import { Category, CategorySearchQueryVariables } from '@vue-storefront/magento-
55
import { UseCategorySearchFactory, useCategorySearchFactory } from '../../factories/useCategorySearchFactory';
66
import { UseCategorySearch } from '../../types/composables';
77

8+
/**
9+
* @deprecated since version 1.0.0
10+
*/
811
const factoryParams: UseCategorySearchFactory<Category, CategorySearchQueryVariables> = {
912
search: async (context: Context, params): Promise<Category[]> => {
1013
Logger.debug('[Magento]: Search for category using', { params });

packages/composables/src/composables/useConfig/index.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import {Context, Logger} from '@vue-storefront/core';
1+
/**
2+
* @deprecated since version 1.0.0
3+
*/
4+
import { Context, Logger } from '@vue-storefront/core';
25
import { StoreConfig } from '@vue-storefront/magento-api';
36
import { useConfigFactory, UseConfigFactoryParams } from '../../factories/useConfigFactory';
47
import { UseConfig } from '../../types/composables';

packages/composables/src/composables/useContent/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/**
2+
* @deprecated since version 1.0.0
3+
*/
14
import { Context, Logger } from '@vue-storefront/core';
25
import { Page, CmsBlock } from '@vue-storefront/magento-api';
36
import { useContentFactory, UseContentFactoryParams } from '../../factories/useContentFactory';

packages/composables/src/composables/useCurrency/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/**
2+
* @deprecated since version1.0.0
3+
*/
14
import { Context } from '@vue-storefront/core';
25
import { Currency } from '@vue-storefront/magento-api';
36
import { useCurrencyFactory, UseCurrencyFactoryParams } from '../../factories/useCurrencyFactory';

packages/composables/src/composables/useExternalCheckout/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ import { useExternalCheckoutFactory, UseExternalCheckoutFactoryParams } from '..
33
import useCart from '../useCart';
44
// import useConfig from '../useConfig';
55

6+
/**
7+
* @deprecated since version1.0.0
8+
*/
69
const factoryParams: UseExternalCheckoutFactoryParams = {
710
provide() {
811
return {

packages/composables/src/composables/useFacet/_utils.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// @depracated - moved to theme
2+
13
import { SearchData } from '../../types';
24

35
const buildBreadcrumbsList = (rootCat, bc) => {

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/**
2+
* @deprecated since version1.0.0
3+
*/
14
import {
25
ComposableFunctionArgs,
36
Context,
@@ -58,6 +61,9 @@ const constructSortObject = (sortData: string) => {
5861
return baseData.length > 0 ? Object.fromEntries([baseData]) : {};
5962
};
6063

64+
/**
65+
* @deprecated since version1.0.0
66+
*/
6167
const factoryParams = {
6268
// eslint-disable-next-line @typescript-eslint/no-unused-vars
6369
search: async (context: Context, params: ComposableFunctionArgs<FacetSearchResult<any>>) => {

0 commit comments

Comments
 (0)